Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvmerge: probe text subs after unambiguous binary formats

Browse Source
This commit is contained in:
Moritz Bunkus 2014-05-18 15:58:59 +02:00
parent d189f9cf46
commit b54d9923d6
4 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2014-05-18 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Changed the file type detection order
again. The text subtitle formats are now probed after those binary
formats that can be detected quickly and unambiguously. This
avoids some mis-detection if e.g. Matroska files as ASS text
subtitles if they do contain such a track.
* mmg: enhancement: The chapter editor will only use fast-mode
parsing when loading chapters from Matroska files.

67
src/merge/output_control.cpp
View File

@ -349,6 +349,36 @@ open_playlist_file(filelist_t &file,
return true;
}
static file_type_e
detect_text_file_formats(filelist_t const &file) {
auto text_io = mm_text_io_cptr{};
try {
text_io = std::make_shared<mm_text_io_c>(new mm_file_io_c(file.name));
auto text_size = text_io->get_size();
if (srt_reader_c::probe_file(text_io.get(), text_size))
return FILE_TYPE_SRT;
else if (ssa_reader_c::probe_file(text_io.get(), text_size))
return FILE_TYPE_SSA;
else if (vobsub_reader_c::probe_file(text_io.get(), text_size))
return FILE_TYPE_VOBSUB;
else if (usf_reader_c::probe_file(text_io.get(), text_size))
return FILE_TYPE_USF;
// Unsupported text subtitle formats
else if (microdvd_reader_c::probe_file(text_io.get(), text_size))
return FILE_TYPE_MICRODVD;
} catch (mtx::mm_io::exception &ex) {
mxerror(boost::format(Y("The file '%1%' could not be opened for reading: %2%.\n")) % file.name % ex);
} catch (...) {
mxerror(boost::format(Y("The source file '%1%' could not be opened successfully, or retrieving its size by seeking to the end did not work.\n")) % file.name);
}
return FILE_TYPE_IS_UNKNOWN;
}
/** \brief Probe the file type
Opens the input file and calls the \c probe_file function for each known
@ -366,35 +396,6 @@ get_file_type_internal(filelist_t &file) {
file_type_e type = FILE_TYPE_IS_UNKNOWN;
// All text file types (subtitles).
auto text_io = mm_text_io_cptr{};
try {
text_io = std::make_shared<mm_text_io_c>(new mm_file_io_c(file.name));
auto text_size = text_io->get_size();
if (srt_reader_c::probe_file(text_io.get(), text_size))
type = FILE_TYPE_SRT;
else if (ssa_reader_c::probe_file(text_io.get(), text_size))
type = FILE_TYPE_SSA;
else if (vobsub_reader_c::probe_file(text_io.get(), text_size))
type = FILE_TYPE_VOBSUB;
else if (usf_reader_c::probe_file(text_io.get(), text_size))
type = FILE_TYPE_USF;
// Unsupported text subtitle formats
else if (microdvd_reader_c::probe_file(text_io.get(), text_size))
type = FILE_TYPE_MICRODVD;
if (type != FILE_TYPE_IS_UNKNOWN)
return std::make_pair(type, text_size);
} catch (mtx::mm_io::exception &ex) {
mxerror(boost::format(Y("The file '%1%' could not be opened for reading: %2%.\n")) % file.name % ex);
} catch (...) {
mxerror(boost::format(Y("The source file '%1%' could not be opened successfully, or retrieving its size by seeking to the end did not work.\n")) % file.name);
}
// File types that can be detected unambiguously but are not supported
if (aac_adif_reader_c::probe_file(io, size))
type = FILE_TYPE_AAC;
@ -406,6 +407,7 @@ get_file_type_internal(filelist_t &file) {
type = FILE_TYPE_FLV;
else if (hdsub_reader_c::probe_file(io, size))
type = FILE_TYPE_HDSUB;
// File types that can be detected unambiguously
else if (avi_reader_c::probe_file(io, size))
type = FILE_TYPE_AVI;
@ -435,6 +437,13 @@ get_file_type_internal(filelist_t &file) {
type = FILE_TYPE_COREAUDIO;
else if (dirac_es_reader_c::probe_file(io, size))
type = FILE_TYPE_DIRAC;
// All text file types (subtitles).
else
type = detect_text_file_formats(file);
if (FILE_TYPE_IS_UNKNOWN != type)
; // intentional fall-through
// File types that are misdetected sometimes and that aren't supported
else if (dv_reader_c::probe_file(io, size))
type = FILE_TYPE_DV;

1
tests/results.txt
View File

@ -273,3 +273,4 @@ T_424avc_recover_point_sei_before_second_field:b66042e704ced1b55a5283d4b09876de:
T_425mpeg_ts_timestamp_outlier:d9c6a4a1c7e815fed80a038128899586:passed:20140305-203603:2.509694471
T_426extract_write_bom_only_once:a9255d40de93e2731aaead0a746e582f-a9255d40de93e2731aaead0a746e582f:passed:20140310-195606:0.0
T_427ui_locale_pt_BR:8719aedc77a0435129c79e3a061642bf-344b51e9ae6fe2d8ce60fef18ee0e7d1:passed:20140418-103113:0.143370167
T_428mkv_misdetected_as_ass:e93bf556dd2814f52c44e523ae5b8721:passed:20140518-155446:0.033341203

5
tests/test-428mkv_misdetected_as_ass.rb Executable file
View File

@ -0,0 +1,5 @@
#!/usr/bin/ruby -w
# T_428mkv_misdetected_as_ass
describe "mkvmerge / Matroska file mis-detected as ASS subtitles"
test_identify "data/mkv/detected-as-ass.mkv"