RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

matroska: look for all known matroska file extensions 

For segment linking (this mechanism matches file extensions to avoid
opening files which are most likely not Matroska files in order to speed
up scanning).
This commit is contained in:
wm4 2014-10-06 22:33:21 +02:00
parent a9e6ba1b9a
commit ec7bc388d1
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
player/timeline/tl_matroska.c
View File

@ -21,6 +21,8 @@
#include <inttypes.h> #include <inttypes.h>
#include <assert.h> #include <assert.h>
#include <dirent.h> #include <dirent.h>
#include <string.h>
#include <strings.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
@ -59,7 +61,20 @@ static int cmp_entry(const void *pa, const void *pb)
return 0; return 0;
} }
static char **find_files(const char *original_file, const char *suffix) static bool test_matroska_ext(const char *filename)
{
static const char *const exts[] = {".mkv", ".mka", ".mks", ".mk3d", NULL};
for (int n = 0; exts[n]; n++) {
const char *suffix = exts[n];
int offset = strlen(filename) - strlen(suffix);
// name must end with suffix
if (offset > 0 && strcasecmp(filename + offset, suffix) == 0)
return true;
}
return false;
}
static char **find_files(const char *original_file)
{ {
void *tmpmem = talloc_new(NULL); void *tmpmem = talloc_new(NULL);
char *basename = mp_basename(original_file); char *basename = mp_basename(original_file);
@ -75,9 +90,7 @@ static char **find_files(const char *original_file, const char *suffix)
struct dirent *ep; struct dirent *ep;
int num_results = 0; int num_results = 0;
while ((ep = readdir(dp))) { while ((ep = readdir(dp))) {
int suffix_offset = strlen(ep->d_name) - strlen(suffix); if (!test_matroska_ext(ep->d_name))
// name must end with suffix
if (suffix_offset < 0 || strcmp(ep->d_name + suffix_offset, suffix))
continue; continue;
// don't list the original name // don't list the original name
if (!strcmp(ep->d_name, basename)) if (!strcmp(ep->d_name, basename))
@ -269,7 +282,7 @@ static int find_ordered_chapter_sources(struct MPContext *mpctx,
} else { } else {
MP_INFO(mpctx, "Will scan other files in the " MP_INFO(mpctx, "Will scan other files in the "
"same directory to find referenced sources.\n"); "same directory to find referenced sources.\n");
filenames = find_files(main_filename, ".mkv"); filenames = find_files(main_filename);
num_filenames = MP_TALLOC_ELEMS(filenames); num_filenames = MP_TALLOC_ELEMS(filenames);
talloc_steal(tmp, filenames); talloc_steal(tmp, filenames);
} }