diff --git a/NEWS.md b/NEWS.md
index fbf55a1d2..3a7927a52 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -13,6 +13,13 @@
* MKVToolNix GUI: macOS: when you install the application from the DMG it'll
register itself as an alternate handler for its supported file types. This
allows the use of the "Open with" context menu action in Finder.
+* mkvmerge: tracks in the destination file will now be sorted by their type
+ automatically unless the track order is specified with the `--track-order`
+ option. The order is as follows: video tracks first followed by audio &
+ subtitle tracks with other rarely used types of tracks last. Tracks of the
+ same type will be sorted in the same order as their source files occur in
+ the command-line arguments. Note that this doesn't affect file
+ identification. Implements #3545.
## Bug fixes
diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml
index 7ee9e06fd..322396b31 100644
--- a/doc/man/mkvmerge.xml
+++ b/doc/man/mkvmerge.xml
@@ -424,6 +424,11 @@
starting at 0. The second is a track ID (TID1) from that file. If some track IDs are omitted then those tracks
are created after the ones given with this option have been created.
+
+
+ If this option isn't given, tracks will be sorted by their type first & the order of their source file second. Video tracks come
+ first followed by audio & subtitle tracks. Other rarely used track types come last.
+
diff --git a/src/merge/mkvmerge.cpp b/src/merge/mkvmerge.cpp
index 81548b1ca..3b10f0921 100644
--- a/src/merge/mkvmerge.cpp
+++ b/src/merge/mkvmerge.cpp
@@ -126,7 +126,9 @@ set_usage() {
usage_text += Y(" --track-order \n"
" A comma separated list of both file IDs\n"
" and track IDs that controls the order of the\n"
- " tracks in the destination file.\n");
+ " tracks in the destination file. If not given,\n"
+ " the tracks will sorted by type (video, audio,\n"
+ " subtitles, others).\n");
usage_text += Y(" --cluster-length Put at most n data blocks into each cluster.\n"
" If the number is postfixed with 'ms' then\n"
" put at most n milliseconds of data into each\n"
diff --git a/src/merge/output_control.cpp b/src/merge/output_control.cpp
index 12d8781a3..823600c8d 100644
--- a/src/merge/output_control.cpp
+++ b/src/merge/output_control.cpp
@@ -539,6 +539,39 @@ generate_segment_uids() {
s_seguid_next.generate_random();
}
+static int
+sortable_track_type_for_file_and_track_id(track_order_t const &track_order) {
+ auto const type = g_files[track_order.file_id]->reader->m_reader_packetizers[track_order.track_id]->get_track_type();
+
+ return type == track_video ? 1
+ : type == track_audio ? 2
+ : type == track_subtitle ? 3
+ : 99;
+}
+
+static bool
+track_order_less_than_for_type(track_order_t const &a,
+ track_order_t const &b) {
+ return sortable_track_type_for_file_and_track_id(a) < sortable_track_type_for_file_and_track_id(b);
+}
+
+static void
+create_type_based_track_order() {
+ auto file_id = -1;
+
+ for (auto const &file : g_files) {
+ ++file_id;
+
+ if (file->appending)
+ continue;
+
+ for (int track_id = 0, end = file.get()->reader->m_reader_packetizers.size(); track_id < end; ++track_id)
+ g_track_order.push_back(track_order_t{ file_id, track_id });
+ }
+
+ std::stable_sort(g_track_order.begin(), g_track_order.end(), track_order_less_than_for_type);
+}
+
/** \brief Render the basic EBML and Matroska headers
Renders the segment information and track headers. Also reserves
@@ -651,6 +684,9 @@ render_headers(mm_io_c *out) {
if (first_file) {
g_kax_last_entry = nullptr;
+ if (g_track_order.empty())
+ create_type_based_track_order();
+
for (auto const &order : g_track_order)
if ((order.file_id >= 0) && (order.file_id < static_cast(g_files.size())) && !g_files[order.file_id]->appending)
g_files[order.file_id]->reader->set_headers_for_track(order.track_id);
diff --git a/tests/results.txt b/tests/results.txt
index 0cf2be5cc..55f129e87 100644
--- a/tests/results.txt
+++ b/tests/results.txt
@@ -6,8 +6,8 @@ T_0005flac:a3b2e5787d20a358f5af8806216a3738:passed:20040825-175700:0.124415853
T_0006oggflac:b1a3caf88dbb4b80aac2dbe6f47fb45f:passed:20040825-175700:0.107798744
T_0007oggvorbis:1d00e78489352aed24de5ebca227366e:passed:20040825-175700:0.134631323
T_0008avi_divx3_mp3:36504bb29dcc406dfe1cd3f02e05866b:passed:20040825-175700:0.250149194
-T_0009realvideo_3:90a54757cf26ccc69aec94a5454a1bca:passed:20040825-175700:0.269130774
-T_0010realvideo_4:1cab0fe824366c1435cc3200a814fa5b:passed:20040825-175700:0.133965049
+T_0009realvideo_3:21ca056bd5f54a78cc86f243ddf7a519:passed:20040825-175700:0.269130774
+T_0010realvideo_4:45af9c2a28433eb16f1b307acd880593:passed:20040825-175700:0.133965049
T_0011srt:978c1dc3a889fd9f34e9e104953fb8d9:passed:20040825-175700:0.05079915
T_0012ssa:806b86b362115419dee409eb133d3bf5:passed:20040825-175700:0.050361156
T_0013vobsubs:fba8fd342819cf243bb18330857fd20a:passed:20040825-175700:0.071757683
@@ -99,16 +99,16 @@ T_0250tag_selection:abb20e5f4d2a8a6c2d6d4e2e007b232a-cbaee51cd2c60066d40d90e3d60
T_0251vc1_truehd_eac3_from_evo:c3e3c6ea1293696ffff4803e02488fc8:passed:20090606-220945:0.374443836
T_0252native_mpeg4:373814031925c9c89af95c87b023df3a:passed:20090620-163119:2.148476233
T_0254avi_with_subs:665012fa40f1f800e2ce5c385ed48216-665012fa40f1f800e2ce5c385ed48216-2adfee6d0da23aa28bc60a43a0d6b122-17355633078675f7c8c66e6c175c68df-c436ec2cd79352952a849468578178df:passed:20091025-104213:1.133544547
-T_0255aspect_ratio_display_dimensions:0[4254x815-4254x815-1212x2424-1800x360-3600x360]1[3600x360-3600x360-1212x2424-1800x360-3600x360]2[7200x360-7200x360-1212x2424-1800x360-3600x360]:passed:20091025-164606:2.038096695
+T_0255aspect_ratio_display_dimensions:0[4254x815-4254x815-1212x2424-1800x360-7200x360]1[3600x360-3600x360-1212x2424-1800x360-7200x360]2[14400x360-14400x360-1212x2424-1800x360-7200x360]:passed:20091025-164606:2.038096695
T_0256cropping_stereo_mode:0[S2-1-2-3-4]1[S1-5-6-7-8]:passed:20091025-204854:0.404846044
T_0257theora_v1_1:3019af501962570b0dad6f005c02933a-7ab420a65619629f06209894b19ff411:passed:20091217-134109:1.056685804
T_0258srt_negative_timecodes:a4a60031cb9586bfd6bacd21f4eaa14a:passed:20091226-220350:0.234074879
T_0259mp4_chapters_text_trak:50411fcb281fa134cbf771477dab45aa-836ed7856df2310b1641ea48e415247a:passed:20091230-221546:2.548017548
T_0260version_numbers:ok:passed:20100120-131720:0.151644954
T_0261line_endings_in_text_files:2ba4b9978a2efb48a83e482a6c192076-2ba4b9978a2efb48a83e482a6c192076-2ba4b9978a2efb48a83e482a6c192076:passed:20100315-151719:0.256349271
-T_0262level1_with_size_0:36afee1035793a83f2dbd0d742f63ffa:passed:20100407-131350:0.049863624
+T_0262level1_with_size_0:adcf4fefcf86bd7d2ee3efaa321e84f6:passed:20100407-131350:0.049863624
T_0263ass_missing_text_in_format:bd95477c9e13954a02220c5e306cff51-a61282e47789865563878c33b90689c7:passed:20100411-181436:0.08481106
-T_0264avc_es_from_lavf_with_native_codecid:05aa319716da239792c8edbd0e2c3de2:passed:20100427-123025:0.113031166
+T_0264avc_es_from_lavf_with_native_codecid:9aa0740287ba6c13b6dbf7c89d810d93:passed:20100427-123025:0.113031166
T_0265mkvinfo_clusters_with_unknown_size:850e2df249cf836ef9777c1f1e915518:passed:20100522-213708:0.070457035
T_0266mkvmerge_clusters_with_unknown_size:7ad25c0cfa624c0102e2dfa6b6a2fed6:passed:20100523-154308:0.513856747
T_0267mkvextract_clusters_with_unknown_size:b994ef83db70b5193696121cf1399adf:passed:20100523-154920:0.151236551
@@ -208,12 +208,12 @@ T_0360X_chapters_hex_format:7ea0e18506ab399866b699d0c4d6cee0-aae3e24614c20119bb4
T_0361file_concatenation:VTS_01_2.VOB+VTS_01_3.VOB-e0916a78f326d75e8760465f71a751d6-e0916a78f326d75e8760465f71a751d6-ee2f07f2683b0919126a058b0e0073d6-ee2f07f2683b0919126a058b0e0073d6-ee2f07f2683b0919126a058b0e0073d6-d337de08d99c5aa755198c61c754599c-9e1cb6eeada264ce87fb3aecd3e523e0-09f753651bd8d38da97d199181126156-09f753651bd8d38da97d199181126156-09f753651bd8d38da97d199181126156-09f753651bd8d38da97d199181126156-261ed3a639358a0fcdeb9ae3f303a521-7fa67f66a61aef344e57e8f44ab5c73d-abc830cc7855b52ee378dec8ae778875-abc830cc7855b52ee378dec8ae778875:passed:20120406-144928:3.327094415
T_0362xtr_avc:f3d8dacaa376d8ab1603c5547908a946-49ae33bdb1e43de90886bc2ac6410c35:passed:20120416-153515:0.322147148
T_0363srt_colon_decimal_separator:3a358fbc2721e599738e2279e2bfe78b:passed:20120520-180625:0.044307942
-T_0364qtmp4_track_with_empty_chunkmap_table:b92494e8fe993ecfe59bbe67aa636426:passed:20120605-223925:0.171457229
+T_0364qtmp4_track_with_empty_chunkmap_table:65e3ec2bb6545d589e408ea653ffc6df:passed:20120605-223925:0.171457229
T_0365qtmp4_constant_sample_size:efee920d0f3d9ffe834c6bea180152c1-c87a389716e92e3bd8a9886cb17775ad:passed:20120605-230823:0.863321194
T_0366srt_with_space_in_timecode_arrow:b1a3af7e800ae1c49617607f098584cd:passed:20120801-132204:0.053007932
T_0367vob_80ms_delay_by_b_frames:27c843eac5700ef9714b7bcd37e428da-1c8901f0622d5f4fc0f639a3b680dfeb:passed:20120801-182507:0.116235015
T_0368alac:9ceea11ad9723d72f7a945981744be24-ef613fe26755b88e76dbb44e6a29c726-9854d1b18d9c3a89a8e5974726293fd3-3fc7308ef86e882e1bf55702bca86430:passed:20120805-160128:0.437055964
-T_0369mpeg_ts_timecode_overflow:fbdb40d127a1c7a89d2382ec6da0ff7e:passed:20120807-120810:1.172529145
+T_0369mpeg_ts_timecode_overflow:68741215340426bf4dc74303c450e2f1:passed:20120807-120810:1.172529145
T_0370propedit_attachments:4d48a3c824a1a353cbef8ebfeb4be206-4d48a3c824a1a353cbef8ebfeb4be206-ba7370ca444ada04c67edad0d3596ee7-4d48a3c824a1a353cbef8ebfeb4be206-ba7370ca444ada04c67edad0d3596ee7-4d48a3c824a1a353cbef8ebfeb4be206-ba7370ca444ada04c67edad0d3596ee7-4d48a3c824a1a353cbef8ebfeb4be206-43b6baa61fe771b4ec84acaf7325e658-4d48a3c824a1a353cbef8ebfeb4be206-0cd7e74bbf6c67136ffec8b84d3832ff-4d48a3c824a1a353cbef8ebfeb4be206-4d98b754796ff0f8f3d79fbfe09a5cb7-4d48a3c824a1a353cbef8ebfeb4be206-c60390d7baa9733db98d08989e8dac3f-4d48a3c824a1a353cbef8ebfeb4be206-c7693dd51bf2c2ec95b80c9fbfe6ac7f-4d48a3c824a1a353cbef8ebfeb4be206-ac7f5c470acb9ca36af8af2040702611-4d48a3c824a1a353cbef8ebfeb4be206-6bb15d8c0cd41594e2a652464575f914-4d48a3c824a1a353cbef8ebfeb4be206-6bb15d8c0cd41594e2a652464575f914-4d48a3c824a1a353cbef8ebfeb4be206-f7ba336b8c1819e0ea660258ede62587-4d48a3c824a1a353cbef8ebfeb4be206-151c80a9da17011ea61f349bbc048e99-4d48a3c824a1a353cbef8ebfeb4be206-ead6c8d93e31e1559a64ad32e447d049-4d48a3c824a1a353cbef8ebfeb4be206-ead6c8d93e31e1559a64ad32e447d049-4d48a3c824a1a353cbef8ebfeb4be206-cab0216d339b25ab13692b75d8fb7d06-4d48a3c824a1a353cbef8ebfeb4be206-dcb9a92e13ea45b9319c4892a0669abf-4d48a3c824a1a353cbef8ebfeb4be206-66a64f3e289ce46e9e71914a5c5bc53f-4d48a3c824a1a353cbef8ebfeb4be206-321bb2bb0063c5090961ef2197988eb2-4d48a3c824a1a353cbef8ebfeb4be206-4f5785aa462b90b0e64a83fc14054c32-4d48a3c824a1a353cbef8ebfeb4be206-a8c79d7b9a2293fc562ad4fb10c81177-4d48a3c824a1a353cbef8ebfeb4be206-921c6db9268a89628b9b141eeff1edba-4d48a3c824a1a353cbef8ebfeb4be206-b69f1ca5eedf664b0ccf25147b9dae80:passed:20120902-110003:2.528270292
T_0371doc_and_read_version:4+2-4+2-4+2-4+2-4+2-4+1-4+1-4+1:passed:20120927-110447:2.276056215
T_0372ui_locale_eu_ES:cd0927f0c4248d14b97336097ee36c2e-8ef1b15c1dcfa5a888fab14cdeec0cda:passed:20120930-150340:0.070503686
@@ -246,7 +246,7 @@ T_0398flv1_no_pixel_dimensions:94b66f04460003515435c7f28e4d1003:passed:20130624-
T_0399h264_append_and_default_duration:206936a265badb9e29dd0cff377a7f58:passed:20130627-195946:1.204478603
T_0400opus_experimental:08c93f858f9ab05cfe8e4cc0cd57bdd8:passed:20130703-213929:0.111009464
T_0401opus_experimental_remux:7e2f84f48e970914d87aa425ae74f262:passed:20130703-213932:0.130261598
-T_0402opus_output_order:33b28785baba19e76da4eb537a475dc7:passed:20130705-115856:0.233979648
+T_0402opus_output_order:f479e922f1aa9355646bb017adee44de:passed:20130705-115856:0.233979648
T_0403opus_remux_final:78ab28e6941662399ad28b6021e4da7f:passed:20130705-135811:0.120709181
T_0404opus_extraction:0aba264a50870d5cd62d8d12543898bd:passed:20130915-201931:0.065946799
T_0405packet_ordering_and_default_duration:316ffd6093f99474091e2dbfab33f52a:passed:20130916-211719:0.420985471
@@ -289,7 +289,7 @@ T_0441mkvmerge_mp4_big_endian_pcm:80208af0e40b4693b14662c50d6f151a:passed:201411
T_0442ui_locale_ca_ES:e799c32fad802af9eb581be621be42e1-efc218c7d73104f27e852a4d6b66412e:passed:20141105-201811:0.085124612
T_0443hevc_keep_user_data:59e4349cb6f6934da01c67e9caf624d8:passed:20141105-202533:0.191547198
T_0444pcm_statistics_from_packaged_sources:eb7db0de497c9b6d4eb010598b68675b-eb7db0de497c9b6d4eb010598b68675b-70e3f90af0e59bb539261d3950d55244-70e3f90af0e59bb539261d3950d55244-+++:passed:20141205-220805:0.841764638
-T_0445teletext_subs_missing_second_line:c01b15fee0b41ca8b7247e62594aabb1:passed:20141210-224823:1.706118809
+T_0445teletext_subs_missing_second_line:998345836b1863ab97c2855c0a8272e7:passed:20141210-224823:1.706118809
T_0446mkvinfo_output:b59cf9a6aa368fceac25e3fe856fee7c-995937aadc1da23f1470554008099343-6d3e24785b998f8f84ff5d331d6c7021-7a01d6443aeb4c2b47f7e5d7e84dec93-fa5209fc67a5b84fe796bd364a00cc64-7d590caa83ef2fd88b371027578dd4e4-c5c99e9444b36fc10340b9dea516966b-131db4e7dbfa080f36bc53c48d2da664-fa83a34042551af0668756b04026f67d-e2e03f33e1dd69641a1e286afab3fe98-d973134fc1d48170b8783f0b1b32f638-ac5293a69a3e6b20d968ec58d87df5ae-a2d26ce78834081cd14eb27dfb477ec6-31d4a07b9fadba265889665a45918c39-f911a2c5524ba7e78de6c210a2879184-b6e946c3229627d31f75246559875bcc-038c66f5a96831bc8d29d58da840382a-b05c0bc757ca084ff8d6a436b600de72-47dcdf0da3afc4aca5722dfffb61b560-84a0de136c7956183120eabacbcd0917-7210c21d6108a09834e48557e31d8f50-ef4632b305e6b9d81d0aed68cfcc4442-65de27994ed47028f14189685bc74e2d-b4928d1b6883924051bac4bbe8687c4e:passed:20141216-165433:3.601785635
T_0447mkvinfo_rounded_timecodes:9ed6879cbd3a977f66dac73b98519f33-3ae00f30fa7122c199c2dbccf3fde84d-c284a50b49f9ece98f157fdec9b5430b:passed:20141216-172642:0.481508215
T_0448mpeg_ts_with_hevc:f47860537f811ea5acc35be694f2827b:passed:20141216-181650:0.40050358
@@ -319,7 +319,7 @@ T_0471mp3_bit_id3_tag_at_start_of_file:370bd0d6dbcfee97b157dcc27d7bf91a-8d9012c1
T_0472flv_headers_signal_no_tracks:d6e649ba8cebb13c47976d25490821af-d23c8a2a51424d811241a0be46f16215:passed:20150309-182340:0.28866888
T_0473quicktime_cinepak_pcm:026e7450f118398613ee042c8c0bc90a-b54f6f87ff9a78862558262892872f5e:passed:20150309-204710:0.179467497
T_0474quicktime_rpza:8f29de9543c615ec5059a83782f6ceb3-d6981911743905df0da3288f87990a15:passed:20150311-192934:0.130187877
-T_0475quicktime_ima4_audio:f195ff6ca3f8084c89485f36fa3dfa17-e3af4eb02830da819ea22caa7af35b3c-fc015fd30aa4c7f40d909d8bfc08be1f:passed:20150313-221230:0.376533899
+T_0475quicktime_ima4_audio:f195ff6ca3f8084c89485f36fa3dfa17-0f39b2c6e376a0fdc6a2601cac02899b-cd265c22a22ff9d009bdba9eb05cbccc:passed:20150313-221230:0.376533899
T_0476hevc_append_and_set_default_duration:0dd5a978c2a6d84a176dc332de7b0889:passed:20150323-142700:0.352800407
T_0477ui_locale_sv_SE:23026ac2ed9767541e89f2261bcf8b60-938dc06fdd5c54793ae6c09b8a0268b1:passed:20150324-123356:0.075002422
T_0478ui_locale_sr_RS_latin:e82297022868c560a80c41513033ef39-2cdbfc8453e871653f2243f91e7a8fcb:passed:20150829-204735:0.08139514
@@ -399,7 +399,7 @@ T_0551deprecated_cctld_codes:b9d9b27e6695ad2a9e54852e5b57f30e-5ffeefc0f652c5749e
T_0552chapter_generation_appending_file_name_variables:e0014b2852ca66dac88f52a039a6a297:passed:20160710-203404:0.265192622
T_0553ogg_kate:cd8396419777cbace049fbc7da809b92-3517ad25f4cf12f9e8c895c9c6dbe4e5-a1d6f87bc50ae14322c6018dbb019034-a3a6b5baf4f013a912a4baec85c1c489-3aa94b10ef5d5731d5892868e2c50aee-c71a6aec86fe232c6a8e24cbc6047008-1b0f11285e22121f5927621bb4855eeb-c65c37768e483ed9db79f3dcd4775b62-b037249d1972a35c2e36423d5f0c444d-a9a2540c3576375689a3f8605ea6c620-06badae10ce2895a6a2d90aa4606308a-a76ca73d5568fbf5a46d84dcc01c6192-d2ed477611ffa805438fc2383f385ad3-945109bfcaaea31d1ac511e8998374f1-c86b85945d07316a1ec0413757d980a1-dc14556eb3c232e628c6e776afc4647e:passed:20160729-134725:0.858050614
T_0554ogg_vp8:01d9bc6472c29b9c82726d0b1a7fba91-22b523a87fd342174f3668985115719c:passed:20160729-190454:0.110220619
-T_0555appending_with_square_brackets:7ddab0243e00a20e0de7acb3267828a8-7ddab0243e00a20e0de7acb3267828a8-7ddab0243e00a20e0de7acb3267828a8-7ddab0243e00a20e0de7acb3267828a8-7ddab0243e00a20e0de7acb3267828a8-7ddab0243e00a20e0de7acb3267828a8:passed:20160730-115423:1.371165547
+T_0555appending_with_square_brackets:c2fa46dfa52873fea5deede840599bcb-c2fa46dfa52873fea5deede840599bcb-c2fa46dfa52873fea5deede840599bcb-c2fa46dfa52873fea5deede840599bcb-c2fa46dfa52873fea5deede840599bcb-c2fa46dfa52873fea5deede840599bcb:passed:20160730-115423:1.371165547
T_0556prores:b77bcebee6da4c34860da7c1e4e92a48-34eeadd2ac3067b0149fa07d41e60258-76042cf0f5c2f789fe806c683eafc72c-9e47da3262a207efd735271b5873daf8-86be5987b2f19b423f044d845ec23183-86be5987b2f19b423f044d845ec23183:passed:20160806-201730:1.521891825
T_0557dts_hd_ma_xll_extension:96000-192000-dd9f026183f451bf46e639874d9b6587-dd9f026183f451bf46e639874d9b6587:passed:20160810-203155:0.338017242
T_0558segfaults_issue_1780_part_1:error-error-error-error-error:passed:20160906-210126:0.261432859
@@ -444,7 +444,7 @@ T_0596mpeg_ts_aac_loas_latm_misdetected_as_adts:9f7af9903c54392846ec308346edd4cb
T_0597mpeg_ts_starting_with_avc_start_code:bcc02dbd864ffd8c8485741d76ba27db:passed:20170510-145746:0.07613792
T_0598aac_track_not_listed_in_pmt:570a4777885c5de3fdb0cd93a9c62857-AAC:passed:20170511-221910:0.160317684
T_0599mp4_nclx_color_type_in_colr_atom:8918ef6c58ff40bf35d92f46dd7b59da:passed:20170514-203828:0.068110641
-T_0600mpeg_ts_multiple_programs:59596cce88b7b0ca1e4bcb5d43cd798b-04be4f1923a0f10a879f082c5918d8a3-5a1ae013b1916964c52d1ed80adefde1-b0e15c07da6080b43a60e4b635b02e99:passed:20170522-193901:1.013242128
+T_0600mpeg_ts_multiple_programs:c4003ee4623dc84a402c78f6de74e4c9-04be4f1923a0f10a879f082c5918d8a3-71532ba813d753cbae936a67f23def41-b0e15c07da6080b43a60e4b635b02e99:passed:20170522-193901:1.013242128
T_0601mp4_mpeg2_via_esds:b8c8c68e014cae0f8565e9d22fa7e7fa:passed:20170618-150319:0.319922344
T_0602vob_with_garbage_at_start:8af88c4ad2e460c323e5e58207b55cf8:passed:20170619-185256:0.135309327
T_0603mpeg_ps_ac3_not_enough_data_in_first_packet:1+189+128+AC_3-2+189+129+AC_3-3+189+130+AC_3-4+189+131+AC_3-5+189+132+AC_3-6+189+133+AC_3-7+189+134+AC_3:passed:20170624-092201:0.061882344
@@ -469,11 +469,11 @@ T_0621propedit_remove_date:1a7c1c4c41a6fac44de162bc34daed64-ok:passed:20171101-1
T_0622aac_adts_8_channels_no_pce:bda79d22f19bb67c72fd03f0f1e8944a-ok:passed:20171117-190136:0.173552412
T_0623text_files_utf16le_different_line_endings:aa23dcad5aebc91db65c80fb8c0e7f4f:passed:20171201-143509:0.072485567
T_0624h264_fix_bitstream_timing_info_exactly:a8bc99f46a464ec3fd96b7eef4997c81:passed:20171218-202838:0.106331677
-T_0625h264_fix_bitstream_timing_info_in_framed_packetizer:0a31049c8d12efd8cd28e7632e569294:passed:20171218-203251:0.060946279
+T_0625h264_fix_bitstream_timing_info_in_framed_packetizer:83857384b0d1a8a2278cda47c1116f92:passed:20171218-203251:0.060946279
T_0626X_avc_two_consecutive_idr_with_same_idr_pic_id:6d023939360f96f54599a4d481cfbde5:passed:20171219-220538:0.05087073
T_0627h264_sps_pps_between_slices_of_same_frame:972072e19507d05d099577254b8cddd3:passed:20171221-153453:0.039563123
T_0628srt_no_decimal_places:4cdcb36795a0fb3b38611cac7980d570:passed:20180102-191637:0.070696246
-T_0629mpeg_ts_broken_pes_packets:43054bdfb796b47fc7017cabf52d29a6:passed:20180113-212211:0.190835185
+T_0629mpeg_ts_broken_pes_packets:b376dc456e5f18bf60512515f0b06d6b:passed:20180113-212211:0.190835185
T_0630propedit_add_statistics_tags_with_compression:54d3f1b2de817a97d82fc65eb038c4b3-18+70+590:passed:20180118-205706:0.153635835
T_0631ogg_opus_packet_without_data:823284f264d5f383a731608bb4b88a0f:passed:20180210-164242:0.196680388
T_0632flv_aac_codec_initialization_more_than_5_bytes:59dc047e68f42c5db41bd843c686e963:passed:20180222-152609:0.333656616
@@ -499,7 +499,7 @@ T_0651sync_chapter_timestamps:488a9e29b8b3cd29dae82fab12b0cf35-73ed8d8331cc91d14
T_0652quicktime_pcm_in24:062813ee1b9771f730974cfabb5f47ce-true:passed:20181001-103254:1.923693932
T_0653X_text_subtitles_without_duration:5162bddd5f57ee5fb7e8fa2da506d963:passed:20181005-185654:0.047151348
T_0654text_subtitles_without_duration:4315307be16606eff855c6a8ced02a66:passed:20181005-202509:0.052093947
-T_0655mpeg_ts_teletext_subs_long_gap_until_end_of_display:39d854bf7c3119b5097a78f3973d8358:passed:20181005-212927:2.169433869
+T_0655mpeg_ts_teletext_subs_long_gap_until_end_of_display:e8de4a8b349bfe90aeaadc5e3bc8a2b2:passed:20181005-212927:2.169433869
T_0656mpeg_ts_bad_utf8_in_service_names2:92321b1451050a6fa6b3853c72783c9a:passed:20181006-122753:0.056613914
T_0657av1_from_mp4:8796e35e8c47146b713698355bb19a5f:passed:20181007-220646:0.267172573
T_0658X_av1:20347e54bac4d1b0fe82d1f2f6c17c4d-d50b6ebae94466fe3acea0c7677797c1:passed:20181007-225807:0.078555903
@@ -561,7 +561,7 @@ T_0713mp4_avc_with_empty_avcc:17e78e6f09e0039c7ae3679d43f18432:passed:20210108-1
T_0714avi_video_aspect_ratio:d40a4fd4eb002c48367cfecdd47afccf-4331bdc2bccdb8b1fb2f753eb567bfc3:passed:20210110-144940:0.247513638
T_0715byte_swapped_ac3:aefd0f347cb14d2fe5b8c9e4bb3e12fb:passed:20210207-115041:0.078944156
T_0716X_hevc_parameter_sets_before_first_frame_differ_from_codecprivate:500a2ece86b5560e55806934d2bccce1:passed:20210218-194923:0.042570082
-T_0717bluray_identification:1678ca6001492a7dff112db2eb5171b9-e6c7be4300dd9290d3e025eede2736cc:passed:20210219-160953:0.501332702
+T_0717bluray_identification:1678ca6001492a7dff112db2eb5171b9-b6d94f093d3a7ebd46d4e29005a9b8e5:passed:20210219-160953:0.501332702
T_0718non_ascii_characters_in_file_names:59a0f9d69a0520b83ea603cd34957e3e-b2b670aad928949d27913c1450f26830-7535de2c43cbc270e2443220acb401eb-2a041e9b321d9271a5e8a3e612689995-1a7c1c4c41a6fac44de162bc34daed64-09b64e39a78de0d56d7d5d3ee76e89c8-ab63dbf588cab59608a7306fa65ee50a-7535de2c43cbc270e2443220acb401eb-32751831418847d69442ffd5edb2103e-1a7c1c4c41a6fac44de162bc34daed64:passed:20210219-161442:0.534302838
T_0719aac_loas_channel_config_13:2b88eb8ba291819379e447b6b9815ef3-true-f293a0dfecfe77a626bb09c5be98446a-true:passed:20210405-210312:0.222922264
T_0720empty_srt_files:999573e18851098220d742be705cae38-999573e18851098220d742be705cae38:passed:20210517-230235:0.097003191
@@ -601,4 +601,4 @@ T_0753webm_block_addition_id_4:60a6843c3a98b2c1c05cd8051b8ce4a4-c428c630ca54e3c9
T_0754ac3_with_garbage_0x1001:fdb95953eac0ed2a023a2e3f01d80f4a-6684b82f5107abb94715b680ad394604:passed:20230408-195832:0.130427241
T_0755mp4_title:83363433b425f24bb6b15da2db368677-96be4ac27e1f7b8e4ff8e82f5125d45d-88cc82a92e465dd7f09812b93f2fc7e2:passed:20230410-162736:0.478663415
T_0756cropping_in_json_output_if_values_0:5c0d482b9af2977a7364c452f27bf084-ok:passed:20230504-012817:0.17246505
-T_0757av1_overwriting_aspect_ratio:0[4254x815-4254x815-1212x2424-1760x352-3200x352]-1[3520x352-3520x352-1212x2424-1760x352-3200x352]-2[6400x352-6400x352-1212x2424-1760x352-3200x352]:passed:20230505-142751:3.517551664
+T_0757av1_overwriting_aspect_ratio:0[4254x815-4254x815-1212x2424-1760x352-5818x352]-1[3520x352-3520x352-1212x2424-1760x352-5818x352]-2[11636x352-11636x352-1212x2424-1760x352-5818x352]:passed:20230505-142751:3.517551664