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

Matroska/MPEG TS readers: allow recoding text subtitles via --sub-charset

Browse Source
This commit is contained in:
Moritz Bunkus 2018-06-21 19:51:15 +02:00
parent 34188f2323
commit 91debcd8ea
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS.md
View File

@ -12,6 +12,9 @@
* mkvmerge: SRT/ASS/SSA/WebVTT text subtitles: a warning is now emitted if
invalid 8-bit characters are encountered outside valid multi-byte UTF-8
sequences. Part of the implementation of #2246.
* mkvmerge: Matroska & MPEG transport stream readers: the encoding of text
subtitles read from Matroska files can now be changed with the
`--sub-charset` parameter.
## Bug fixes

3
src/input/r_matroska.cpp
View File

@ -2007,7 +2007,8 @@ kax_reader_c::create_subtitle_packetizer(kax_track_t *t,
} else if (balg::starts_with(t->codec_id, "S_TEXT") || (t->codec_id == "S_SSA") || (t->codec_id == "S_ASS")) {
std::string new_codec_id = ((t->codec_id == "S_SSA") || (t->codec_id == "S_ASS")) ? "S_TEXT/"s + std::string(&t->codec_id[2]) : t->codec_id;
set_track_packetizer(t, new textsubs_packetizer_c(this, nti, new_codec_id.c_str()));
auto recoding_requested = mtx::includes(m_ti.m_sub_charsets, t->tnum) || mtx::includes(m_ti.m_sub_charsets, t->tnum);
set_track_packetizer(t, new textsubs_packetizer_c(this, nti, new_codec_id.c_str(), recoding_requested));
show_packetizer_info(t->tnum, t->ptzr_ptr);
t->sub_type = 't';

5
src/input/r_mpeg_ts.cpp
View File

@ -2343,9 +2343,10 @@ reader_c::create_hdmv_textst_subtitles_packetizer(track_ptr const &track) {
void
reader_c::create_srt_subtitles_packetizer(track_ptr const &track) {
track->ptzr = add_packetizer(new textsubs_packetizer_c(this, m_ti, MKV_S_TEXTUTF8));
auto recoding_requested = mtx::includes(m_ti.m_sub_charsets, track->m_id) || mtx::includes(m_ti.m_sub_charsets, track->m_id);
track->ptzr = add_packetizer(new textsubs_packetizer_c(this, m_ti, MKV_S_TEXTUTF8, recoding_requested));
auto &converter = dynamic_cast<teletext_to_srt_packet_converter_c &>(*track->converter);
auto &converter = dynamic_cast<teletext_to_srt_packet_converter_c &>(*track->converter);
converter.demux_page(*track->m_ttx_wanted_page, PTZR(track->ptzr));
converter.override_encoding(*track->m_ttx_wanted_page, track->language);

1
tests/results.txt
View File

@ -492,3 +492,4 @@ T_643mpeg_ts_bad_utf8_in_service_names:f967b2bf3fb4265ec723f14eb667bb9a:passed:2
T_644mp3_with_discard_padding:e68074afaedbb820210e31e3cf62febc:passed:20180619-214051:0.038730751
T_645ogg_opus_first_timestamp_negative:4b513ca85e1cf12b378eedd07c8b4ffa-78778f6067b903cc326bf0f998f9790b:passed:20180620-185732:0.925863056
T_646ogg_opus_gap_page_missing:c3c8ff65984de89ce37c2f03520ae83f:passed:20180621-154830:0.009743698
T_647recode_textsubs_from_matroska:2e63dc90381d8f5191b852aac6cc3b05-b297cba0182c465fa537abd668f1e6a0:passed:20180621-194122:0.024017386

9
tests/test-647recode_textsubs_from_matroska.rb Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/ruby -w
# T_647recode_textsubs_from_matroska
describe "mkvmerge / recode text subtitles read from Matroska files"
file = "data/mkv/attachments.mkv"
test_merge file, :args => "--no-attachments", :exit_code => :warning
test_merge file, :args => "--no-attachments --sub-charset 0:iso-8859-1"