Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-12 13:14:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

extract: chapters: don't add ChapterLanguage elements if not present in file

Browse Source
This commit is contained in:
Moritz Bunkus 2021-03-15 17:46:48 +01:00
parent dcfe41269a
commit 5f42b31006
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS.md
View File

@ -13,6 +13,9 @@
will no longer write chapter elements that are mandatory and set to their
default value (e.g. "chapter language" set to `eng` = English or "Chapter
flag enabled" = 1).
* mkvextract: chapters: mkvextract will no longer add a `ChapterLanguage`
element set to `eng` to the generated XML content if the source file doesn't
contain such an element.
## Bug fixes

11
src/common/xml/ebml_chapters_converter.cpp
View File

@ -72,10 +72,6 @@ ebml_chapters_converter_c::fix_xml(document_cptr &doc)
result = doc->select_nodes("//ChapterDisplay[not(ChapterString)]");
for (auto &atom : result)
atom.node().append_child("ChapterString");
result = doc->select_nodes("//ChapterDisplay[not(ChapterLanguage)]");
for (auto &atom : result)
atom.node().append_child("ChapterLanguage").append_child(pugi::node_pcdata).set_value("eng");
}
void
@ -159,12 +155,15 @@ ebml_chapters_converter_c::fix_display(KaxChapterDisplay &display)
clanguage_ietf->SetValue(parsed_language.format());
if (parsed_language.has_valid_iso639_2_code()) {
if (!clanguage) {
auto code = parsed_language.get_iso639_alpha_3_code();
if ((code != "eng"s) && !clanguage) {
clanguage = new KaxChapterLanguage;
display.PushElement(*clanguage);
}
clanguage->SetValue(parsed_language.get_iso639_alpha_3_code());
if (clanguage)
clanguage->SetValue(code);
} else if (clanguage) {
auto language_opt = mtx::iso639::look_up(clanguage->GetValue());

10
tests/results.txt
View File

@ -168,7 +168,7 @@ T_320ts_aac:9df573c91da2fb3d1f828ecc7077de26:passed:20111022-140411:0.693145547
T_321vc1_without_markers:b747cec8a644bfa45be86e7fbe12486a:passed:20111104-003839:1.584477691
T_322propedit_track_headers:785209f2dc35ad6177bea2ca6e43198f-ffc1ef67684cc9dd8626a4a7521e72ee-d2d12b7f8d1b036e4da6d0905b6107f0-9d9f4b00040791a912599b3bc8bc3056-efe56b89f19d9f4678ba2502447fcbb1:passed:20111203-152145:0.677404829
T_323propedit_segment_info:785209f2dc35ad6177bea2ca6e43198f-0baf1cb46e7d365580b51aa4452551d6-d6cd21681b8544aa730744f128d46fd7:passed:20111203-152845:0.425794709
T_324propedit_chapters:785209f2dc35ad6177bea2ca6e43198f-a9255d40de93e2731aaead0a746e582f-6a52edf8320a69cb5390787dca3bce4c-cd61f949342404e4512185eb2d4be9bf-089863b7ec31a38b1b492be915fc8d45-fe69617fa470d18d03d07c9e47f56535-ce165f1284c318f12803057a97fa398e-6a0e3cab0fa095f2ebbf5647070026ff-5aa640f146966af8b53456ddfbb999a7-d41d8cd98f00b204e9800998ecf8427e:passed:20111203-154502:0.736303091
T_324propedit_chapters:785209f2dc35ad6177bea2ca6e43198f-a9255d40de93e2731aaead0a746e582f-6a52edf8320a69cb5390787dca3bce4c-773f26e09778648416ce3bea4534153a-089863b7ec31a38b1b492be915fc8d45-b31deae722b7f7b36161efb911abb6d6-ce165f1284c318f12803057a97fa398e-3cd0f90451dcf62aed25aa2256eedfb5-5aa640f146966af8b53456ddfbb999a7-d41d8cd98f00b204e9800998ecf8427e:passed:20111203-154502:0.736303091
T_325propedit_tags:785209f2dc35ad6177bea2ca6e43198f-26ad4ab0491d76d9fb6f57b4a4b35400-4c3fe3b20a8c687a120cdf0ad547c9dd-116d4eec445ea94488dfeb4a017c9d62-4c3fe3b20a8c687a120cdf0ad547c9dd-116d4eec445ea94488dfeb4a017c9d62-b073261609f9449ef51eebadbcd4fd2e-23d42f32bdc2b7c83e539e030a8696be-2827cafef06f38cc82085a93c706ec9d-fbc96cb0e594d568501452863d73065c-2827cafef06f38cc82085a93c706ec9d-fbc96cb0e594d568501452863d73065c-ffc807c4755a75ce29599862b764fe55-65d18a109586c9e66ecd693970305947-36c99a98a4e96259c8f24fb56387a655-d41d8cd98f00b204e9800998ecf8427e:passed:20111203-160727:1.314514241
T_326mpeg_ps_mpeg_audio_layer4:dc6215428e07fb41b5bb6d4f4de847f1:passed:20111207-224511:1.505513342
T_327vp8_frame_type:eca3264992ce75a5e743816f419fa199:passed:20111207-233304:0.089263543
@ -204,7 +204,7 @@ T_356tags:7d10777478399640e21f25a18ee755cc-20058095e5ce36408e1be5686cd35020-66b5
T_357segment_info:5705d44c964fb0807502aebb37f8661b-add1a8de0925f19f952d1228cef89a01-ok-ok-ok-ok-ok-ok-ok:passed:20120324-122844:0.227807646
T_358usf:1dac49aebe86754fa619c001725eb418:passed:20120329-142144:0.051754089
T_359split_parts:1abd18e6964c59cb0f948d5c85458f70+03a993ab01b98f8b96cff072badc8b1d+ok-29acd740ce1f441551954a1d8d83f7ec+ok-15ca49cd8a3385856ff19e59bbdbc5fb+ok-1fc60e95a85fbfa347a0474b60de2e9e+bfd62c029e91e3a285c211507f1d8867+a938e935042baf9706d64acf55dee095+513295a96663c00e7401f8b7afd0c7a4+0b78fc440acc27a4c3a7df66675618d5+34649459b5f03b98af259aef9bcf59a5+56b3f357b75f3597a8bdb14682e1c77c+ok-e52364bbb3c13a04c758dfdc557dd82e+ok-b866d52b59da43254bc561efc7f909d3+ok:passed:20120331-133448:2.321768368
T_360X_chapters_hex_format:702218e81e504cb813adcdfc383fe4b6-8d92db9aee600001b00a6c446be21e7c:passed:20120404-152038:0.047282116
T_360X_chapters_hex_format:702218e81e504cb813adcdfc383fe4b6-b60bd86d66634377e07a2df16cc93ecc:passed:20120404-152038:0.047282116
T_361file_concatenation:VTS_01_2.VOB+VTS_01_3.VOB-05bfa369747ccf5e02c12fb02b526f44-05bfa369747ccf5e02c12fb02b526f44-71ef966ddf0b3a312d1901cb9e779f6e-71ef966ddf0b3a312d1901cb9e779f6e-71ef966ddf0b3a312d1901cb9e779f6e-4c44f518a3009e6c5cc6df2642278861-9e1cb6eeada264ce87fb3aecd3e523e0-cd198cb8fe72bb756d90ebd65ad368f4-cd198cb8fe72bb756d90ebd65ad368f4-cd198cb8fe72bb756d90ebd65ad368f4-cd198cb8fe72bb756d90ebd65ad368f4-b44b78f8d225b8b2467a58577cb03a74-6c21bd306a2bc7463dcbfc503dd329e0-95ced262a634220c2c5fa5643a686800-95ced262a634220c2c5fa5643a686800:passed:20120406-144928:18.646532342
T_362xtr_avc:b184771e500ffc210d28ceebc94ba1a3-49ae33bdb1e43de90886bc2ac6410c35:passed:20120416-153515:1.811589633
T_363srt_colon_decimal_separator:37a2408c96d30cca25baf4c0d24cf8f8:passed:20120520-180625:0.032379535
@ -284,7 +284,7 @@ T_436extract_ssa_extradata_after_events:328b5a3024216b6dba05f9e5b7655464:passed:
T_437ac3_from_avi_with_garbage:b873a4337e15208b5a9753a450a2b91f:passed:20140908-144311:0.075599921
T_438pcm_in_vob:1542732a37f268c8d0ff7dea3b21f457:passed:20140917-213731:1.216717009
T_439pcm_in_m2ts:f3150327983d09ff2e5f3013d036c1d4-4769a6942eaa57839df8f4a39c1aefd6:passed:20140917-222633:4.736872644
T_440chapter_display_language_default_value:0a68a9c36028b06a5323193c4516a3af:passed:20140929-142306:0.021103552
T_440chapter_display_language_default_value:5327301bd7fdd9fff7d161efed1a3738:passed:20140929-142306:0.021103552
T_441mkvmerge_mp4_big_endian_pcm:7b62ec44804bd2a157dbd93e2c3ef370:passed:20141104-190420:0.278181073
T_442ui_locale_ca_ES:e799c32fad802af9eb581be621be42e1-efc218c7d73104f27e852a4d6b66412e:passed:20141105-201811:0.070000034
T_443hevc_keep_user_data:39daf2d167d04e6382febea32771f1e3:passed:20141105-202533:1.308417598
@ -548,10 +548,10 @@ T_700X_usf:1dac49aebe86754fa619c001725eb418-46001697d31d3a435ac65008cd37ea5a:pas
T_701subtitles_duration_rounding:d727b6c1522504da6e3187e027e69145:passed:20200801-150217:0.017355231
T_702block_addition_mapping:21a1140e1363f557f332f123966c0293-165a4660aab1881872f2be9db37ac868:passed:20200801-175839:0.377324674
T_703bcp47_mkvmerge_tracks:649c3b23ddd919260aacfc3843d2dee0-ok-6cea988df7bc3f16fc29a9eedbcb24dd-ok-2efc761eef0ab7b1611eab03ccfa1e73-ok-4142b618710c418f5f6b990debfb81dd-ok-1cddfc894acaaf967841284adc68d95d-ok-8a924fac03de11cd7e9c3148fa8d0de4-ok-6803f90aae01a5188a4b423f5663019b-ok-26253739e9b8bf8388d196406d26a637-ok-080774d207e6b0145490ef9462ee91d0-ok-0e8434cc7cc1ba21b365fef2fd1d17fa-ok-ok-b856b48371435e5db128cb76df8234cd-ok-605073d366cfcfe925aa539fb51e098b-ok-635db9fdd14824a6482035249e7721a1-ok-34c5d55b43d935ff2c35681173c6d789-ok-b856b48371435e5db128cb76df8234cd-ok-05c550764fac8bd16b4c0e677d708b60-ok-6803f90aae01a5188a4b423f5663019b-3b3e46a20511894f386d0b4d55790692-ok-6803f90aae01a5188a4b423f5663019b-1372aed480ce909f3c03a7d9716f49a5-ok-6803f90aae01a5188a4b423f5663019b-3b3e46a20511894f386d0b4d55790692-ok-6803f90aae01a5188a4b423f5663019b-5dcb7e7d5e26a5496bb610f4eaf130a5-ok-6803f90aae01a5188a4b423f5663019b-5dcb7e7d5e26a5496bb610f4eaf130a5-ok-6803f90aae01a5188a4b423f5663019b-3b3e46a20511894f386d0b4d55790692-ok:passed:20200818-174121:0.0
T_704bcp47_mkvmerge_chapters:3a427d08de294be5b9b01cb655b6e913-ok-e4ec6dbdcd7fdeef92b43a8a78dbb607-ok-472d719ce168ebdc9544ad0020f1609e-ok-e81be6aceccadb0946852871f7e506d8-ok-e81be6aceccadb0946852871f7e506d8-ok-e81be6aceccadb0946852871f7e506d8-ok-e1ed73dc53b2d05ee75e70ad6f3b47bf-ok-96e8031d45ad9e182734f52e3f2c7f46-ok-fb5d5e2d83287d45d3294b59d4d1dea0-ok-5b2283fc43b8ce5908fc0e004d9148ee-ok-5b2283fc43b8ce5908fc0e004d9148ee-ok-5b2283fc43b8ce5908fc0e004d9148ee-ok:passed:20200818-180751:0.24733742
T_704bcp47_mkvmerge_chapters:3a427d08de294be5b9b01cb655b6e913-failed-e4ec6dbdcd7fdeef92b43a8a78dbb607-ok-472d719ce168ebdc9544ad0020f1609e-ok-e81be6aceccadb0946852871f7e506d8-failed-e81be6aceccadb0946852871f7e506d8-failed-e81be6aceccadb0946852871f7e506d8-failed-e1ed73dc53b2d05ee75e70ad6f3b47bf-ok-96e8031d45ad9e182734f52e3f2c7f46-ok-fb5d5e2d83287d45d3294b59d4d1dea0-ok-5b2283fc43b8ce5908fc0e004d9148ee-failed-5b2283fc43b8ce5908fc0e004d9148ee-failed-5b2283fc43b8ce5908fc0e004d9148ee-failed:passed:20200818-180751:0.24733742
T_705bcp47_propedit_language_ietf:649c3b23ddd919260aacfc3843d2dee0-und+und+ok+ger+de_CH+ok+ger+pt_BR+ok+ger++ok+spa+es_MX+ok+eng++ok:passed:20200822-114509:0.096933015
T_706bcp47_mkvmerge_tracks_disable_language_ietf:ebccd4b17fa7c048fdccd07719e0afa7-ok-649c3b23ddd919260aacfc3843d2dee0-ok-435baee92bcd3a3ebbb74c4a36819b84-ok-6cea988df7bc3f16fc29a9eedbcb24dd-435baee92bcd3a3ebbb74c4a36819b84-071937d6ab3739ea219992e473e7c5a9-ok-ok-ok-ebccd4b17fa7c048fdccd07719e0afa7-ok-649c3b23ddd919260aacfc3843d2dee0-ok-435baee92bcd3a3ebbb74c4a36819b84-ok-6cea988df7bc3f16fc29a9eedbcb24dd-435baee92bcd3a3ebbb74c4a36819b84-071937d6ab3739ea219992e473e7c5a9-ok-ok-ok:passed:20200829-101345:0.185494434
T_707bcp47_mkvmerge_chapters_disable_language_ietf:f504bf7501e0d1a67277ae6d76b4d0a2-ok-d7e47b980960c4f41656c7f77ce319c6-ok-d7e47b980960c4f41656c7f77ce319c6-ok-c5d2946651770e0ed3cbdd937bd23557-ok-c5d2946651770e0ed3cbdd937bd23557-ok-c5d2946651770e0ed3cbdd937bd23557-ok-1d6b66ec1ee93f95c33fbb2226466cc5-ok-1c18916e004c9bca5f78ce47126e18e3-ok-1c18916e004c9bca5f78ce47126e18e3-ok-54753e8281224492260d1dada9fc6927-ok-f504bf7501e0d1a67277ae6d76b4d0a2-ok-d7e47b980960c4f41656c7f77ce319c6-ok-d7e47b980960c4f41656c7f77ce319c6-ok-c5d2946651770e0ed3cbdd937bd23557-ok-c5d2946651770e0ed3cbdd937bd23557-ok-c5d2946651770e0ed3cbdd937bd23557-ok-1d6b66ec1ee93f95c33fbb2226466cc5-ok-1c18916e004c9bca5f78ce47126e18e3-ok-1c18916e004c9bca5f78ce47126e18e3-ok-54753e8281224492260d1dada9fc6927-ok:passed:20200829-101752:0.480737581
T_707bcp47_mkvmerge_chapters_disable_language_ietf:f504bf7501e0d1a67277ae6d76b4d0a2-failed-d7e47b980960c4f41656c7f77ce319c6-ok-d7e47b980960c4f41656c7f77ce319c6-ok-c5d2946651770e0ed3cbdd937bd23557-failed-c5d2946651770e0ed3cbdd937bd23557-failed-c5d2946651770e0ed3cbdd937bd23557-failed-1d6b66ec1ee93f95c33fbb2226466cc5-ok-1c18916e004c9bca5f78ce47126e18e3-ok-1c18916e004c9bca5f78ce47126e18e3-ok-54753e8281224492260d1dada9fc6927-failed-f504bf7501e0d1a67277ae6d76b4d0a2-failed-d7e47b980960c4f41656c7f77ce319c6-ok-d7e47b980960c4f41656c7f77ce319c6-ok-c5d2946651770e0ed3cbdd937bd23557-failed-c5d2946651770e0ed3cbdd937bd23557-failed-c5d2946651770e0ed3cbdd937bd23557-failed-1d6b66ec1ee93f95c33fbb2226466cc5-ok-1c18916e004c9bca5f78ce47126e18e3-ok-1c18916e004c9bca5f78ce47126e18e3-ok-54753e8281224492260d1dada9fc6927-failed:passed:20200829-101752:0.480737581
T_708bcp47_propedit_language_ietf_disable_language_ietf:649c3b23ddd919260aacfc3843d2dee0-und+und+ok+ger+und+ok+ger+pt_BR+ok+spa+pt_BR+ok+eng+pt_BR+ok+eng++ok:passed:20200829-103838:0.0
T_709bcp47_mkvmerge_tags:ca0546000eca55bd7e2b46ea2ee848fa:passed:20200903-234135:0.0
T_710fuzzying:ok-ok-ok-ok-ok-ok-ok-ok-ok-ok:passed:20200921-133156:0.059249045