[PR] avformat/matroska: rescale default duration derived block durations to stream timebase (PR #23867)
James Almer via ffmpeg-devel <[email protected]> Tue, 21 Jul 2026 14:26:55 -0000
| Newsgroups | gmane.comp.video.ffmpeg.devel |
|---|---|
| Message-ID | <178464401617.59.14054809116778027102@29965ddac10e> |
PR #23867 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23867 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23867.patch Block timestamps and durations are in Track Ticks, meaning they are scaled with both Segment timescale and Track timescale. >From a6ebc65deb48d9a3c6d40b3264316b06215e0ec4 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Tue, 21 Jul 2026 11:16:00 -0300 Subject: [PATCH 1/2] avformat/matroska: rescale default duration derived block durations to stream timebase Block timestamps and durations are in Track Ticks, meaning they are scaled with both Segment timescale and Track timescale. Signed-off-by: James Almer <[email protected]> --- libavformat/matroskadec.c | 4 +- tests/ref/fate/atrac-matroska-remux | 174 +++++----- tests/ref/fate/ffmpeg-streamloop-transcode-av | 162 ++++----- tests/ref/fate/h264-dts_5frames | 20 +- tests/ref/fate/hevc-bsf-dovi-split-bl | 2 +- tests/ref/fate/hevc-bsf-dovi-split-bl-rpu | 2 +- tests/ref/fate/hevc-bsf-dovi-split-el | 2 +- tests/ref/fate/hevc-bsf-dovi-split-el-rpu | 2 +- tests/ref/fate/matroska-dovi-hvce-mkv-to-mkv | 4 +- tests/ref/fate/matroska-dovi-write-config7 | 40 +-- tests/ref/fate/matroska-flac-channel-mapping | 4 +- .../fate/matroska-mastering-display-metadata | 20 +- tests/ref/fate/matroska-ms-mode | 48 +-- tests/ref/fate/matroska-qt-mode | 90 ++--- tests/ref/fate/mkv | 320 +++++++++--------- tests/ref/fate/mkv-1242 | 38 +-- tests/ref/fate/mov-dovi-hvce-mkv-to-mp4 | 4 +- 17 files changed, 469 insertions(+), 467 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 18849af689..8e24433cf8 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -4365,7 +4365,9 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf } if (!block_duration && trust_default_duration) - block_duration = track->default_duration * laces / matroska->time_scale; + block_duration = av_rescale_q(track->default_duration * laces, + (AVRational) { 1, 1000000000 }, + st->time_base); if (cluster_time != (uint64_t)-1 && (block_time >= 0 || cluster_time >= -block_time)) track->end_timecode = diff --git a/tests/ref/fate/atrac-matroska-remux b/tests/ref/fate/atrac-matroska-remux index b34e801806..1f627959d7 100644 --- a/tests/ref/fate/atrac-matroska-remux +++ b/tests/ref/fate/atrac-matroska-remux @@ -5,90 +5,90 @@ #codec_id 0: atrac1 #sample_rate 0: 44100 #channel_layout_name 0: stereo -0, 0, 0, 11, 424, 0x3b6509a4 -0, 12, 12, 11, 424, 0x3b6509a4 -0, 23, 23, 11, 424, 0x3b6509a4 -0, 35, 35, 11, 424, 0x3b6509a4 -0, 46, 46, 11, 424, 0x3b6509a4 -0, 58, 58, 11, 424, 0x3b6509a4 -0, 70, 70, 11, 424, 0x3b6509a4 -0, 81, 81, 11, 424, 0x3b6509a4 -0, 93, 93, 11, 424, 0x3b6509a4 -0, 104, 104, 11, 424, 0x3b6509a4 -0, 116, 116, 11, 424, 0x3b6509a4 -0, 128, 128, 11, 424, 0x3b6509a4 -0, 139, 139, 11, 424, 0x3b6509a4 -0, 151, 151, 11, 424, 0x3b6509a4 -0, 163, 163, 11, 424, 0x3b6509a4 -0, 174, 174, 11, 424, 0x3b6509a4 -0, 186, 186, 11, 424, 0x3b6509a4 -0, 197, 197, 11, 424, 0x3b6509a4 -0, 209, 209, 11, 424, 0x3b6509a4 -0, 221, 221, 11, 424, 0x3b6509a4 -0, 232, 232, 11, 424, 0x3b6509a4 -0, 244, 244, 11, 424, 0x3b6509a4 -0, 255, 255, 11, 424, 0x3b6509a4 -0, 267, 267, 11, 424, 0x3b6509a4 -0, 279, 279, 11, 424, 0x3b6509a4 -0, 290, 290, 11, 424, 0x3b6509a4 -0, 302, 302, 11, 424, 0x3b6509a4 -0, 313, 313, 11, 424, 0x3b6509a4 -0, 325, 325, 11, 424, 0x3b6509a4 -0, 337, 337, 11, 424, 0x3b6509a4 -0, 348, 348, 11, 424, 0x3b6509a4 -0, 360, 360, 11, 424, 0x3b6509a4 -0, 372, 372, 11, 424, 0x3b6509a4 -0, 383, 383, 11, 424, 0x3b6509a4 -0, 395, 395, 11, 424, 0x3b6509a4 -0, 406, 406, 11, 424, 0x3b6509a4 -0, 418, 418, 11, 424, 0x3b6509a4 -0, 430, 430, 11, 424, 0x3b6509a4 -0, 441, 441, 11, 424, 0x3b6509a4 -0, 453, 453, 11, 424, 0x3b6509a4 -0, 464, 464, 11, 424, 0x3b6509a4 -0, 476, 476, 11, 424, 0x3b6509a4 -0, 488, 488, 11, 424, 0x3b6509a4 -0, 499, 499, 11, 424, 0x3b6509a4 -0, 511, 511, 11, 424, 0x3b6509a4 -0, 522, 522, 11, 424, 0x3b6509a4 -0, 534, 534, 11, 424, 0x3b6509a4 -0, 546, 546, 11, 424, 0x3b6509a4 -0, 557, 557, 11, 424, 0x3b6509a4 -0, 569, 569, 11, 424, 0x3b6509a4 -0, 580, 580, 11, 424, 0x3b6509a4 -0, 592, 592, 11, 424, 0x3b6509a4 -0, 604, 604, 11, 424, 0x3b6509a4 -0, 615, 615, 11, 424, 0x3b6509a4 -0, 627, 627, 11, 424, 0x3b6509a4 -0, 639, 639, 11, 424, 0x3b6509a4 -0, 650, 650, 11, 424, 0x3b6509a4 -0, 662, 662, 11, 424, 0x3b6509a4 -0, 673, 673, 11, 424, 0x3b6509a4 -0, 685, 685, 11, 424, 0x3b6509a4 -0, 697, 697, 11, 424, 0x3b6509a4 -0, 708, 708, 11, 424, 0x9699a148 -0, 720, 720, 11, 424, 0x4b15b57e -0, 731, 731, 11, 424, 0x690fbe86 -0, 743, 743, 11, 424, 0x8980bea4 -0, 755, 755, 11, 424, 0xc792c244 -0, 766, 766, 11, 424, 0x57e1bac4 -0, 778, 778, 11, 424, 0xe813bebe -0, 789, 789, 11, 424, 0x022cbf4e -0, 801, 801, 11, 424, 0x36e1bdce -0, 813, 813, 11, 424, 0x243dbdf4 -0, 824, 824, 11, 424, 0x8eeebba8 -0, 836, 836, 11, 424, 0x8088bbac -0, 848, 848, 11, 424, 0xf75fbc8c -0, 859, 859, 11, 424, 0x9678c284 -0, 871, 871, 11, 424, 0x45edbc50 -0, 882, 882, 11, 424, 0xe9ffbe1e -0, 894, 894, 11, 424, 0x694bbdf0 -0, 906, 906, 11, 424, 0x3f1ab970 -0, 917, 917, 11, 424, 0x6114bbbe -0, 929, 929, 11, 424, 0xf67cc210 -0, 940, 940, 11, 424, 0x9d9cbf4c -0, 952, 952, 11, 424, 0x72ecbe4e -0, 964, 964, 11, 424, 0x1bb4be96 -0, 975, 975, 11, 424, 0x467cbc1c -0, 987, 987, 11, 424, 0x1b2abc80 -0, 998, 998, 11, 424, 0xd0e3befc +0, 0, 0, 12, 424, 0x3b6509a4 +0, 12, 12, 12, 424, 0x3b6509a4 +0, 23, 23, 12, 424, 0x3b6509a4 +0, 35, 35, 12, 424, 0x3b6509a4 +0, 46, 46, 12, 424, 0x3b6509a4 +0, 58, 58, 12, 424, 0x3b6509a4 +0, 70, 70, 12, 424, 0x3b6509a4 +0, 81, 81, 12, 424, 0x3b6509a4 +0, 93, 93, 12, 424, 0x3b6509a4 +0, 104, 104, 12, 424, 0x3b6509a4 +0, 116, 116, 12, 424, 0x3b6509a4 +0, 128, 128, 12, 424, 0x3b6509a4 +0, 139, 139, 12, 424, 0x3b6509a4 +0, 151, 151, 12, 424, 0x3b6509a4 +0, 163, 163, 12, 424, 0x3b6509a4 +0, 174, 174, 12, 424, 0x3b6509a4 +0, 186, 186, 12, 424, 0x3b6509a4 +0, 197, 197, 12, 424, 0x3b6509a4 +0, 209, 209, 12, 424, 0x3b6509a4 +0, 221, 221, 12, 424, 0x3b6509a4 +0, 232, 232, 12, 424, 0x3b6509a4 +0, 244, 244, 12, 424, 0x3b6509a4 +0, 255, 255, 12, 424, 0x3b6509a4 +0, 267, 267, 12, 424, 0x3b6509a4 +0, 279, 279, 12, 424, 0x3b6509a4 +0, 290, 290, 12, 424, 0x3b6509a4 +0, 302, 302, 12, 424, 0x3b6509a4 +0, 313, 313, 12, 424, 0x3b6509a4 +0, 325, 325, 12, 424, 0x3b6509a4 +0, 337, 337, 12, 424, 0x3b6509a4 +0, 348, 348, 12, 424, 0x3b6509a4 +0, 360, 360, 12, 424, 0x3b6509a4 +0, 372, 372, 12, 424, 0x3b6509a4 +0, 383, 383, 12, 424, 0x3b6509a4 +0, 395, 395, 12, 424, 0x3b6509a4 +0, 406, 406, 12, 424, 0x3b6509a4 +0, 418, 418, 12, 424, 0x3b6509a4 +0, 430, 430, 12, 424, 0x3b6509a4 +0, 441, 441, 12, 424, 0x3b6509a4 +0, 453, 453, 12, 424, 0x3b6509a4 +0, 464, 464, 12, 424, 0x3b6509a4 +0, 476, 476, 12, 424, 0x3b6509a4 +0, 488, 488, 12, 424, 0x3b6509a4 +0, 499, 499, 12, 424, 0x3b6509a4 +0, 511, 511, 12, 424, 0x3b6509a4 +0, 522, 522, 12, 424, 0x3b6509a4 +0, 534, 534, 12, 424, 0x3b6509a4 +0, 546, 546, 12, 424, 0x3b6509a4 +0, 557, 557, 12, 424, 0x3b6509a4 +0, 569, 569, 12, 424, 0x3b6509a4 +0, 580, 580, 12, 424, 0x3b6509a4 +0, 592, 592, 12, 424, 0x3b6509a4 +0, 604, 604, 12, 424, 0x3b6509a4 +0, 615, 615, 12, 424, 0x3b6509a4 +0, 627, 627, 12, 424, 0x3b6509a4 +0, 639, 639, 12, 424, 0x3b6509a4 +0, 650, 650, 12, 424, 0x3b6509a4 +0, 662, 662, 12, 424, 0x3b6509a4 +0, 673, 673, 12, 424, 0x3b6509a4 +0, 685, 685, 12, 424, 0x3b6509a4 +0, 697, 697, 12, 424, 0x3b6509a4 +0, 708, 708, 12, 424, 0x9699a148 +0, 720, 720, 12, 424, 0x4b15b57e +0, 731, 731, 12, 424, 0x690fbe86 +0, 743, 743, 12, 424, 0x8980bea4 +0, 755, 755, 12, 424, 0xc792c244 +0, 766, 766, 12, 424, 0x57e1bac4 +0, 778, 778, 12, 424, 0xe813bebe +0, 789, 789, 12, 424, 0x022cbf4e +0, 801, 801, 12, 424, 0x36e1bdce +0, 813, 813, 12, 424, 0x243dbdf4 +0, 824, 824, 12, 424, 0x8eeebba8 +0, 836, 836, 12, 424, 0x8088bbac +0, 848, 848, 12, 424, 0xf75fbc8c +0, 859, 859, 12, 424, 0x9678c284 +0, 871, 871, 12, 424, 0x45edbc50 +0, 882, 882, 12, 424, 0xe9ffbe1e +0, 894, 894, 12, 424, 0x694bbdf0 +0, 906, 906, 12, 424, 0x3f1ab970 +0, 917, 917, 12, 424, 0x6114bbbe +0, 929, 929, 12, 424, 0xf67cc210 +0, 940, 940, 12, 424, 0x9d9cbf4c +0, 952, 952, 12, 424, 0x72ecbe4e +0, 964, 964, 12, 424, 0x1bb4be96 +0, 975, 975, 12, 424, 0x467cbc1c +0, 987, 987, 12, 424, 0x1b2abc80 +0, 998, 998, 12, 424, 0xd0e3befc diff --git a/tests/ref/fate/ffmpeg-streamloop-transcode-av b/tests/ref/fate/ffmpeg-streamloop-transcode-av index 202fc9e53e..7ba9c76c68 100644 --- a/tests/ref/fate/ffmpeg-streamloop-transcode-av +++ b/tests/ref/fate/ffmpeg-streamloop-transcode-av @@ -25,127 +25,127 @@ 1, 9232, 9232, 1024, 8192, 0x00000000 0, 5, 5, 1, 1378560, 0xd6e1d5b7 1, 10248, 10248, 1024, 8192, 0x00000000 -1, 11256, 11256, 1024, 8192, 0x00000000 +1, 11272, 11272, 1024, 8192, 0x00000000 0, 6, 6, 1, 1378560, 0x0b574d39 -1, 12280, 12280, 1024, 8192, 0x00000000 -1, 13304, 13304, 1024, 8192, 0x00000000 +1, 12296, 12296, 1024, 8192, 0x00000000 +1, 13320, 13320, 1024, 8192, 0x00000000 0, 7, 7, 1, 1378560, 0x1bdd4d61 -1, 14328, 14328, 1024, 8192, 0x00000000 -1, 15336, 15336, 1024, 8192, 0x00000000 +1, 14344, 14344, 1024, 8192, 0x00000000 +1, 15368, 15368, 1024, 8192, 0x00000000 0, 8, 8, 1, 1378560, 0x3b28f549 -1, 16360, 16360, 1024, 8192, 0x00000000 -1, 17384, 17384, 1024, 8192, 0x00000000 +1, 16392, 16392, 1024, 8192, 0x00000000 +1, 17400, 17400, 1024, 8192, 0x00000000 0, 9, 9, 1, 1378560, 0x45b2f57b 1, 18408, 18408, 1024, 8192, 0x00000000 -1, 19416, 19416, 1024, 8192, 0x00000000 +1, 19432, 19432, 1024, 8192, 0x00000000 0, 10, 10, 1, 1378560, 0x8955570e -1, 20440, 20440, 1024, 8192, 0x00000000 -1, 21464, 21464, 1024, 8192, 0x00000000 -1, 22488, 22488, 1024, 8192, 0x00000000 -1, 23496, 23496, 1024, 8192, 0x00000000 +1, 20456, 20456, 1024, 8192, 0x00000000 +1, 21480, 21480, 1024, 8192, 0x00000000 +1, 22504, 22504, 1024, 8192, 0x00000000 +1, 23528, 23528, 1024, 8192, 0x00000000 0, 12, 12, 1, 1378560, 0x9c598000 -1, 25536, 25536, 1024, 8192, 0x00000000 +1, 25584, 25584, 1024, 8192, 0x00000000 0, 13, 13, 1, 1378560, 0xbaf121ba -1, 26560, 26560, 1024, 8192, 0x00000000 -1, 27576, 27576, 1024, 8192, 0x00000000 +1, 26608, 26608, 1024, 8192, 0x00000000 +1, 27624, 27624, 1024, 8192, 0x00000000 0, 14, 14, 1, 1378560, 0xbaf121ba -1, 28600, 28600, 1024, 8192, 0x00000000 -1, 29624, 29624, 1024, 8192, 0x00000000 +1, 28648, 28648, 1024, 8192, 0x00000000 +1, 29672, 29672, 1024, 8192, 0x00000000 0, 15, 15, 1, 1378560, 0x6579d31a -1, 30648, 30648, 1024, 8192, 0x00000000 -1, 31656, 31656, 1024, 8192, 0x00000000 +1, 30696, 30696, 1024, 8192, 0x00000000 +1, 31704, 31704, 1024, 8192, 0x00000000 0, 16, 16, 1, 1378560, 0xca1deba8 -1, 32736, 32736, 1024, 8192, 0x00000000 -1, 33760, 33760, 1024, 8192, 0x00000000 +1, 32784, 32784, 1024, 8192, 0x00000000 +1, 33808, 33808, 1024, 8192, 0x00000000 0, 17, 17, 1, 1378560, 0xd4eed467 -1, 34776, 34776, 1024, 8192, 0x00000000 -1, 35784, 35784, 1024, 8192, 0x00000000 +1, 34824, 34824, 1024, 8192, 0x00000000 +1, 35848, 35848, 1024, 8192, 0x00000000 0, 18, 18, 1, 1378560, 0xd6e1d5b7 -1, 36808, 36808, 1024, 8192, 0x00000000 -1, 37832, 37832, 1024, 8192, 0x00000000 +1, 36872, 36872, 1024, 8192, 0x00000000 +1, 37896, 37896, 1024, 8192, 0x00000000 0, 19, 19, 1, 1378560, 0x0b574d39 -1, 38856, 38856, 1024, 8192, 0x00000000 -1, 39864, 39864, 1024, 8192, 0x00000000 +1, 38920, 38920, 1024, 8192, 0x00000000 +1, 39944, 39944, 1024, 8192, 0x00000000 0, 20, 20, 1, 1378560, 0x1bdd4d61 -1, 40888, 40888, 1024, 8192, 0x00000000 -1, 41912, 41912, 1024, 8192, 0x00000000 +1, 40968, 40968, 1024, 8192, 0x00000000 +1, 41976, 41976, 1024, 8192, 0x00000000 0, 21, 21, 1, 1378560, 0x3b28f549 -1, 42936, 42936, 1024, 8192, 0x00000000 -1, 43944, 43944, 1024, 8192, 0x00000000 +1, 42984, 42984, 1024, 8192, 0x00000000 +1, 44008, 44008, 1024, 8192, 0x00000000 0, 22, 22, 1, 1378560, 0x45b2f57b -1, 44968, 44968, 1024, 8192, 0x00000000 -1, 45992, 45992, 1024, 8192, 0x00000000 +1, 45032, 45032, 1024, 8192, 0x00000000 0, 23, 23, 1, 1378560, 0x8955570e -1, 47016, 47016, 1024, 8192, 0x00000000 -1, 48024, 48024, 1024, 8192, 0x00000000 +1, 46056, 46056, 1024, 8192, 0x00000000 +1, 47080, 47080, 1024, 8192, 0x00000000 0, 24, 24, 1, 1378560, 0x9c598000 +1, 48104, 48104, 1024, 8192, 0x00000000 0, 25, 25, 1, 1378560, 0xbaf121ba -1, 50064, 50064, 1024, 8192, 0x00000000 -1, 51088, 51088, 1024, 8192, 0x00000000 +1, 50160, 50160, 1024, 8192, 0x00000000 +1, 51184, 51184, 1024, 8192, 0x00000000 0, 26, 26, 1, 1378560, 0xbaf121ba -1, 52104, 52104, 1024, 8192, 0x00000000 -1, 53128, 53128, 1024, 8192, 0x00000000 +1, 52200, 52200, 1024, 8192, 0x00000000 +1, 53224, 53224, 1024, 8192, 0x00000000 0, 27, 27, 1, 1378560, 0x6579d31a -1, 54152, 54152, 1024, 8192, 0x00000000 -1, 55176, 55176, 1024, 8192, 0x00000000 +1, 54248, 54248, 1024, 8192, 0x00000000 +1, 55272, 55272, 1024, 8192, 0x00000000 0, 28, 28, 1, 1378560, 0xca1deba8 -1, 56184, 56184, 1024, 8192, 0x00000000 -1, 57264, 57264, 1024, 8192, 0x00000000 +1, 56280, 56280, 1024, 8192, 0x00000000 +1, 57360, 57360, 1024, 8192, 0x00000000 0, 29, 29, 1, 1378560, 0xd4eed467 -1, 58288, 58288, 1024, 8192, 0x00000000 -1, 59304, 59304, 1024, 8192, 0x00000000 +1, 58384, 58384, 1024, 8192, 0x00000000 +1, 59400, 59400, 1024, 8192, 0x00000000 0, 30, 30, 1, 1378560, 0xd6e1d5b7 -1, 60312, 60312, 1024, 8192, 0x00000000 -1, 61336, 61336, 1024, 8192, 0x00000000 +1, 60424, 60424, 1024, 8192, 0x00000000 +1, 61448, 61448, 1024, 8192, 0x00000000 0, 31, 31, 1, 1378560, 0x0b574d39 -1, 62360, 62360, 1024, 8192, 0x00000000 -1, 63384, 63384, 1024, 8192, 0x00000000 +1, 62472, 62472, 1024, 8192, 0x00000000 +1, 63496, 63496, 1024, 8192, 0x00000000 0, 32, 32, 1, 1378560, 0x1bdd4d61 -1, 64392, 64392, 1024, 8192, 0x00000000 -1, 65416, 65416, 1024, 8192, 0x00000000 +1, 64520, 64520, 1024, 8192, 0x00000000 +1, 65544, 65544, 1024, 8192, 0x00000000 0, 33, 33, 1, 1378560, 0x3b28f549 -1, 66440, 66440, 1024, 8192, 0x00000000 -1, 67464, 67464, 1024, 8192, 0x00000000 +1, 66552, 66552, 1024, 8192, 0x00000000 +1, 67560, 67560, 1024, 8192, 0x00000000 0, 34, 34, 1, 1378560, 0x45b2f57b -1, 68472, 68472, 1024, 8192, 0x00000000 -1, 69496, 69496, 1024, 8192, 0x00000000 +1, 68584, 68584, 1024, 8192, 0x00000000 +1, 69608, 69608, 1024, 8192, 0x00000000 0, 35, 35, 1, 1378560, 0x8955570e -1, 70520, 70520, 1024, 8192, 0x00000000 -1, 71544, 71544, 1024, 8192, 0x00000000 -1, 72552, 72552, 1024, 8192, 0x00000000 +1, 70632, 70632, 1024, 8192, 0x00000000 +1, 71656, 71656, 1024, 8192, 0x00000000 +1, 72680, 72680, 1024, 8192, 0x00000000 0, 37, 37, 1, 1378560, 0x9c598000 -1, 74592, 74592, 1024, 8192, 0x00000000 -1, 75616, 75616, 1024, 8192, 0x00000000 +1, 74736, 74736, 1024, 8192, 0x00000000 +1, 75760, 75760, 1024, 8192, 0x00000000 0, 38, 38, 1, 1378560, 0xbaf121ba -1, 76632, 76632, 1024, 8192, 0x00000000 -1, 77656, 77656, 1024, 8192, 0x00000000 +1, 76776, 76776, 1024, 8192, 0x00000000 +1, 77800, 77800, 1024, 8192, 0x00000000 0, 39, 39, 1, 1378560, 0xbaf121ba -1, 78680, 78680, 1024, 8192, 0x00000000 -1, 79704, 79704, 1024, 8192, 0x00000000 +1, 78824, 78824, 1024, 8192, 0x00000000 +1, 79848, 79848, 1024, 8192, 0x00000000 0, 40, 40, 1, 1378560, 0x6579d31a -1, 80712, 80712, 1024, 8192, 0x00000000 -1, 81792, 81792, 1024, 8192, 0x00000000 +1, 80856, 80856, 1024, 8192, 0x00000000 +1, 81936, 81936, 1024, 8192, 0x00000000 0, 41, 41, 1, 1378560, 0xca1deba8 -1, 82816, 82816, 1024, 8192, 0x00000000 -1, 83832, 83832, 1024, 8192, 0x00000000 +1, 82960, 82960, 1024, 8192, 0x00000000 +1, 83976, 83976, 1024, 8192, 0x00000000 0, 42, 42, 1, 1378560, 0xd4eed467 -1, 84840, 84840, 1024, 8192, 0x00000000 -1, 85864, 85864, 1024, 8192, 0x00000000 +1, 85000, 85000, 1024, 8192, 0x00000000 +1, 86024, 86024, 1024, 8192, 0x00000000 0, 43, 43, 1, 1378560, 0xd6e1d5b7 -1, 86888, 86888, 1024, 8192, 0x00000000 -1, 87912, 87912, 1024, 8192, 0x00000000 +1, 87048, 87048, 1024, 8192, 0x00000000 +1, 88072, 88072, 1024, 8192, 0x00000000 0, 44, 44, 1, 1378560, 0x0b574d39 -1, 88920, 88920, 1024, 8192, 0x00000000 -1, 89944, 89944, 1024, 8192, 0x00000000 +1, 89096, 89096, 1024, 8192, 0x00000000 0, 45, 45, 1, 1378560, 0x1bdd4d61 -1, 90968, 90968, 1024, 8192, 0x00000000 -1, 91992, 91992, 1024, 8192, 0x00000000 +1, 90120, 90120, 1024, 8192, 0x00000000 +1, 91128, 91128, 1024, 8192, 0x00000000 0, 46, 46, 1, 1378560, 0x3b28f549 -1, 93000, 93000, 1024, 8192, 0x00000000 -1, 94024, 94024, 1024, 8192, 0x00000000 +1, 92136, 92136, 1024, 8192, 0x00000000 +1, 93160, 93160, 1024, 8192, 0x00000000 0, 47, 47, 1, 1378560, 0x45b2f57b -1, 95048, 95048, 1024, 8192, 0x00000000 -1, 96072, 96072, 1024, 8192, 0x00000000 +1, 94184, 94184, 1024, 8192, 0x00000000 +1, 95208, 95208, 1024, 8192, 0x00000000 0, 48, 48, 1, 1378560, 0x8955570e -1, 97080, 97080, 1024, 8192, 0x00000000 +1, 96232, 96232, 1024, 8192, 0x00000000 +1, 97256, 97256, 1024, 8192, 0x00000000 0, 49, 49, 1, 1378560, 0x9c598000 diff --git a/tests/ref/fate/h264-dts_5frames b/tests/ref/fate/h264-dts_5frames index 1e66e3854b..77d20d58c6 100644 --- a/tests/ref/fate/h264-dts_5frames +++ b/tests/ref/fate/h264-dts_5frames @@ -8,8 +8,8 @@ pkt_dts=0 pkt_dts_time=0.000000 best_effort_timestamp=0 best_effort_timestamp_time=0.000000 -duration=166 -duration_time=0.166000 +duration=167 +duration_time=0.167000 pkt_pos=651 pkt_size=14428 width=512 @@ -42,8 +42,8 @@ pkt_dts=167 pkt_dts_time=0.167000 best_effort_timestamp=167 best_effort_timestamp_time=0.167000 -duration=166 -duration_time=0.166000 +duration=167 +duration_time=0.167000 pkt_pos=15085 pkt_size=11 width=512 @@ -76,8 +76,8 @@ pkt_dts=333 pkt_dts_time=0.333000 best_effort_timestamp=333 best_effort_timestamp_time=0.333000 -duration=166 -duration_time=0.166000 +duration=167 +duration_time=0.167000 pkt_pos=15102 pkt_size=11 width=512 @@ -110,8 +110,8 @@ pkt_dts=500 pkt_dts_time=0.500000 best_effort_timestamp=500 best_effort_timestamp_time=0.500000 -duration=166 -duration_time=0.166000 +duration=167 +duration_time=0.167000 pkt_pos=15119 pkt_size=11 width=512 @@ -144,8 +144,8 @@ pkt_dts=667 pkt_dts_time=0.667000 best_effort_timestamp=667 best_effort_timestamp_time=0.667000 -duration=166 -duration_time=0.166000 +duration=167 +duration_time=0.167000 pkt_pos=15136 pkt_size=11 width=512 diff --git a/tests/ref/fate/hevc-bsf-dovi-split-bl b/tests/ref/fate/hevc-bsf-dovi-split-bl index 1551b84e53..09dac95c10 100644 --- a/tests/ref/fate/hevc-bsf-dovi-split-bl +++ b/tests/ref/fate/hevc-bsf-dovi-split-bl @@ -4,4 +4,4 @@ #codec_id 0: hevc #dimensions 0: 3840x2160 #sar 0: 1/1 -0, -125, 0, 41, 491260, 0x0ca664b5 +0, -125, 0, 42, 491260, 0x0ca664b5 diff --git a/tests/ref/fate/hevc-bsf-dovi-split-bl-rpu b/tests/ref/fate/hevc-bsf-dovi-split-bl-rpu index d35814337d..4259e15750 100644 --- a/tests/ref/fate/hevc-bsf-dovi-split-bl-rpu +++ b/tests/ref/fate/hevc-bsf-dovi-split-bl-rpu @@ -4,4 +4,4 @@ #codec_id 0: hevc #dimensions 0: 3840x2160 #sar 0: 1/1 -0, -125, 0, 41, 491661, 0x7676e050 +0, -125, 0, 42, 491661, 0x7676e050 diff --git a/tests/ref/fate/hevc-bsf-dovi-split-el b/tests/ref/fate/hevc-bsf-dovi-split-el index 0a4592aa8d..1ef718ebc7 100644 --- a/tests/ref/fate/hevc-bsf-dovi-split-el +++ b/tests/ref/fate/hevc-bsf-dovi-split-el @@ -4,4 +4,4 @@ #codec_id 0: hevc #dimensions 0: 1920x1080 #sar 0: 1/1 -0, -125, 0, 41, 175255, 0xf7a84c6b +0, -125, 0, 42, 175255, 0xf7a84c6b diff --git a/tests/ref/fate/hevc-bsf-dovi-split-el-rpu b/tests/ref/fate/hevc-bsf-dovi-split-el-rpu index fe83f8dd0d..8712312aa7 100644 --- a/tests/ref/fate/hevc-bsf-dovi-split-el-rpu +++ b/tests/ref/fate/hevc-bsf-dovi-split-el-rpu @@ -4,4 +4,4 @@ #codec_id 0: hevc #dimensions 0: 1920x1080 #sar 0: 1/1 -0, -125, 0, 41, 175656, 0x5363c806 +0, -125, 0, 42, 175656, 0x5363c806 diff --git a/tests/ref/fate/matroska-dovi-hvce-mkv-to-mkv b/tests/ref/fate/matroska-dovi-hvce-mkv-to-mkv index e1b832d947..6ed187f613 100644 --- a/tests/ref/fate/matroska-dovi-hvce-mkv-to-mkv +++ b/tests/ref/fate/matroska-dovi-hvce-mkv-to-mkv @@ -1,4 +1,4 @@ -d9c448202481e87d921bb81f268082e6 *tests/data/fate/matroska-dovi-hvce-mkv-to-mkv.matroska +82ad40ca2bc7d0557755df01f9f16b10 *tests/data/fate/matroska-dovi-hvce-mkv-to-mkv.matroska 668201 tests/data/fate/matroska-dovi-hvce-mkv-to-mkv.matroska #extradata 0: 187, 0x34a930cb #tb 0: 1/1000 @@ -6,7 +6,7 @@ d9c448202481e87d921bb81f268082e6 *tests/data/fate/matroska-dovi-hvce-mkv-to-mkv. #codec_id 0: hevc #dimensions 0: 3840x2160 #sar 0: 1/1 -0, -125, 0, 41, 666936, 0x27d831d4 +0, -125, 0, 42, 666936, 0x27d831d4 [STREAM] [SIDE_DATA] side_data_type=DOVI configuration record diff --git a/tests/ref/fate/matroska-dovi-write-config7 b/tests/ref/fate/matroska-dovi-write-config7 index 1e61e0a5a9..dc2e3c2f96 100644 --- a/tests/ref/fate/matroska-dovi-write-config7 +++ b/tests/ref/fate/matroska-dovi-write-config7 @@ -12,26 +12,26 @@ a713f83f8b20954728839450a7697491 *tests/data/fate/matroska-dovi-write-config7.ma #codec_id 1: hevc #dimensions 1: 1920x1080 #sar 1: 0/1 -0, -83, 0, 41, 699, 0x728548f1 -1, -83, 0, 41, 1085, 0xfb2dba82 -0, -42, 167, 41, 95, 0xc0312044, F=0x0 -1, -42, 167, 41, 481, 0xf23f91d5, F=0x0 -0, 0, 83, 41, 99, 0x5e0a2221, F=0x0 -1, 0, 83, 41, 485, 0x5f7b93b2, F=0x0 -0, 42, 42, 41, 99, 0xe60e208b, F=0x0 -1, 42, 42, 41, 485, 0x8335921c, F=0x0 -0, 83, 125, 41, 99, 0xa1e422e1, F=0x0 -1, 83, 125, 41, 485, 0xc4e49472, F=0x0 -0, 125, 333, 41, 96, 0xdc762089, F=0x0 -1, 125, 333, 41, 482, 0x769c921a, F=0x0 -0, 167, 250, 41, 100, 0x89cd22a0, F=0x0 -1, 167, 250, 41, 486, 0x4aca9431, F=0x0 -0, 208, 208, 41, 100, 0x6d4521ff, F=0x0 -1, 208, 208, 41, 486, 0x3b719390, F=0x0 -0, 250, 292, 41, 99, 0x92ab22c0, F=0x0 -1, 250, 292, 41, 485, 0x83e99451, F=0x0 -0, 292, 292, 41, 95, 0xcd9020bd, F=0x0 -1, 292, 292, 41, 481, 0x44ec924e, F=0x0 +0, -83, 0, 42, 699, 0x728548f1 +1, -83, 0, 42, 1085, 0xfb2dba82 +0, -41, 167, 42, 95, 0xc0312044, F=0x0 +1, -41, 167, 42, 481, 0xf23f91d5, F=0x0 +0, 0, 83, 42, 99, 0x5e0a2221, F=0x0 +1, 0, 83, 42, 485, 0x5f7b93b2, F=0x0 +0, 42, 42, 42, 99, 0xe60e208b, F=0x0 +1, 42, 42, 42, 485, 0x8335921c, F=0x0 +0, 83, 125, 42, 99, 0xa1e422e1, F=0x0 +1, 83, 125, 42, 485, 0xc4e49472, F=0x0 +0, 125, 333, 42, 96, 0xdc762089, F=0x0 +1, 125, 333, 42, 482, 0x769c921a, F=0x0 +0, 167, 250, 42, 100, 0x89cd22a0, F=0x0 +1, 167, 250, 42, 486, 0x4aca9431, F=0x0 +0, 208, 208, 42, 100, 0x6d4521ff, F=0x0 +1, 208, 208, 42, 486, 0x3b719390, F=0x0 +0, 250, 292, 42, 99, 0x92ab22c0, F=0x0 +1, 250, 292, 42, 485, 0x83e99451, F=0x0 +0, 292, 292, 42, 95, 0xcd9020bd, F=0x0 +1, 292, 292, 42, 481, 0x44ec924e, F=0x0 [STREAM] [/STREAM] [STREAM] diff --git a/tests/ref/fate/matroska-flac-channel-mapping b/tests/ref/fate/matroska-flac-channel-mapping index 91a778853f..bc5aa578cb 100644 --- a/tests/ref/fate/matroska-flac-channel-mapping +++ b/tests/ref/fate/matroska-flac-channel-mapping @@ -30,7 +30,7 @@ 1, 32770, 32770, 4096, 26, 0x51b00449 0, 36866, 36866, 4096, 26, 0x518b042e 1, 36866, 36866, 4096, 26, 0x518b042e -0, 40962, 40962, 4096, 26, 0x50f60447 -1, 40962, 40962, 4096, 26, 0x50f60447 +0, 40962, 40962, 4097, 26, 0x50f60447 +1, 40962, 40962, 4097, 26, 0x50f60447 0, 45059, 45059, 3072, 28, 0x72540504 1, 45059, 45059, 3072, 28, 0x72540504 diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata index 6f10dc57a6..8b5313cef2 100644 --- a/tests/ref/fate/matroska-mastering-display-metadata +++ b/tests/ref/fate/matroska-mastering-display-metadata @@ -22,25 +22,25 @@ bdca53906b34c57192416a0f737b885e *tests/data/fate/matroska-mastering-display-met #codec_id 3: ffv1 #dimensions 3: 1280x720 #sar 3: 1/1 -0, 0, 0, 16, 57008, 0x43416399 +0, 0, 0, 17, 57008, 0x43416399 1, 0, 0, 16, 2403, 0xaa818522 -3, 0, 0, 16, 274884, 0x775840e5 -0, 17, 17, 16, 57248, 0xa06cd7b5 +3, 0, 0, 17, 274884, 0x775840e5 +0, 17, 17, 17, 57248, 0xa06cd7b5 1, 17, 17, 16, 2403, 0xe1a991e5 2, 17, 17, 16, 1602, 0x5d868171 -3, 17, 17, 16, 273716, 0xa41fc5e3, F=0x0 -0, 33, 33, 16, 57200, 0x5623da10 +3, 17, 17, 17, 273716, 0xa41fc5e3, F=0x0 +0, 33, 33, 17, 57200, 0x5623da10 1, 33, 33, 16, 2400, 0x6650907f 2, 33, 33, 16, 1600, 0xa90f0044 -3, 33, 33, 16, 272838, 0x3c308d03, F=0x0 -0, 50, 50, 16, 57152, 0x52d89d3f +3, 33, 33, 17, 272838, 0x3c308d03, F=0x0 +0, 50, 50, 17, 57152, 0x52d89d3f 1, 50, 50, 16, 2403, 0x43398a08 2, 50, 50, 16, 1602, 0x3a350084 -3, 50, 50, 16, 271251, 0xe802cc77, F=0x0 -0, 67, 67, 16, 56960, 0x431d5189 +3, 50, 50, 17, 271251, 0xe802cc77, F=0x0 +0, 67, 67, 17, 56960, 0x431d5189 1, 67, 67, 16, 2403, 0x61cd96cb 2, 67, 67, 16, 1602, 0xd74800c6 -3, 67, 67, 16, 270553, 0x36d83705, F=0x0 +3, 67, 67, 17, 270553, 0x36d83705, F=0x0 [STREAM] index=0 codec_name=prores diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode index 0e31c990dc..4b6b0e9ccf 100644 --- a/tests/ref/fate/matroska-ms-mode +++ b/tests/ref/fate/matroska-ms-mode @@ -12,77 +12,77 @@ e7f44cd6a5c0f45fea11874afb8c1c0d *tests/data/fate/matroska-ms-mode.matroska #codec_id 1: speex #sample_rate 1: 32000 #channel_layout_name 1: mono -0, 0, 0, 41, 12972, 0x6588cf8e +0, 0, 0, 42, 12972, 0x6588cf8e 1, 0, 0, 0, 74, 0xd4eb274d 1, 20, 20, 0, 74, 0xef822181 1, 40, 40, 0, 74, 0x61e3239c -0, 42, 42, 41, 478, 0xeca1eeb9 +0, 42, 42, 42, 478, 0xeca1eeb9 1, 60, 60, 0, 74, 0x474623d5 1, 80, 80, 0, 74, 0x79a21f22 -0, 83, 83, 41, 260, 0x335f8133 +0, 83, 83, 42, 260, 0x335f8133 1, 100, 100, 0, 74, 0xb3022058 1, 120, 120, 0, 74, 0x57a32240 -0, 125, 125, 41, 199, 0xf6f86142 +0, 125, 125, 42, 199, 0xf6f86142 1, 140, 140, 0, 74, 0x34892453 1, 160, 160, 0, 74, 0x55621efb -0, 167, 167, 41, 188, 0x0eeb5f55 +0, 167, 167, 42, 188, 0x0eeb5f55 1, 180, 180, 0, 74, 0xb92f206a 1, 200, 200, 0, 74, 0x1988222e -0, 209, 209, 41, 183, 0x921a5b3c +0, 209, 209, 42, 183, 0x921a5b3c 1, 220, 220, 0, 74, 0x033b20dc 1, 240, 240, 0, 74, 0xf8f41da4 -0, 250, 250, 41, 181, 0xae765703 +0, 250, 250, 42, 181, 0xae765703 1, 260, 260, 0, 74, 0xfc89201f 1, 280, 280, 0, 74, 0x2b102428 -0, 292, 292, 41, 181, 0xdc975d93 +0, 292, 292, 42, 181, 0xdc975d93 1, 300, 300, 0, 74, 0x2df42380 1, 320, 320, 0, 74, 0xebcf20fd -0, 334, 334, 41, 181, 0x30355b73 +0, 334, 334, 42, 181, 0x30355b73 1, 340, 340, 0, 74, 0x3eb524f8 1, 360, 360, 0, 74, 0x1f802308 -0, 375, 375, 41, 179, 0xef275e89 +0, 375, 375, 42, 179, 0xef275e89 1, 380, 380, 0, 74, 0x218d23bd 1, 400, 400, 0, 74, 0x77f82421 -0, 417, 417, 41, 181, 0xbdb35a1b +0, 417, 417, 42, 181, 0xbdb35a1b 1, 420, 420, 0, 74, 0xf20023a3 1, 440, 440, 0, 74, 0x82cc1f9a -0, 459, 459, 41, 179, 0x1b245f55 +0, 459, 459, 42, 179, 0x1b245f55 1, 460, 460, 0, 74, 0x8d3222e4 1, 480, 480, 0, 74, 0x939d1e4c 1, 500, 500, 0, 74, 0x55c3232c -0, 501, 501, 41, 181, 0x30355b73 +0, 501, 501, 42, 181, 0x30355b73 1, 520, 520, 0, 74, 0x85e02092 1, 540, 540, 0, 74, 0xb9d02059 -0, 542, 542, 41, 179, 0xef275e89 +0, 542, 542, 42, 179, 0xef275e89 1, 560, 560, 0, 74, 0xbbd8211f 1, 580, 580, 0, 74, 0xe0ca20e1 -0, 584, 584, 41, 181, 0xbdb35a1b +0, 584, 584, 42, 181, 0xbdb35a1b 1, 600, 600, 0, 74, 0xd4f9216b 1, 620, 620, 0, 74, 0xdea723f9 -0, 626, 626, 41, 179, 0x1b245f55 +0, 626, 626, 42, 179, 0x1b245f55 1, 640, 640, 0, 74, 0xc2611fe9 1, 660, 660, 0, 74, 0x9f941f2d -0, 667, 667, 41, 181, 0x30355b73 +0, 667, 667, 42, 181, 0x30355b73 1, 680, 680, 0, 74, 0xaf991eb9 1, 700, 700, 0, 74, 0x7e79250e -0, 709, 709, 41, 179, 0xef275e89 +0, 709, 709, 42, 179, 0xef275e89 1, 720, 720, 0, 74, 0x5a421faa 1, 740, 740, 0, 74, 0x3b211ce0 -0, 751, 751, 41, 181, 0xbdb35a1b +0, 751, 751, 42, 181, 0xbdb35a1b 1, 760, 760, 0, 74, 0x4a812478 1, 780, 780, 0, 74, 0xfc1b234f -0, 792, 792, 41, 179, 0x1b245f55 +0, 792, 792, 42, 179, 0x1b245f55 1, 800, 800, 0, 74, 0x3d561db1 1, 820, 820, 0, 74, 0x6bbb2475 -0, 834, 834, 41, 181, 0x30355b73 +0, 834, 834, 42, 181, 0x30355b73 1, 840, 840, 0, 74, 0x76fe1f63 1, 860, 860, 0, 74, 0x15861cf1 -0, 876, 876, 41, 179, 0xef275e89 +0, 876, 876, 42, 179, 0xef275e89 1, 880, 880, 0, 74, 0x7dca1c6a 1, 900, 900, 0, 74, 0xad8b20aa -0, 918, 918, 41, 181, 0xbdb35a1b +0, 918, 918, 42, 181, 0xbdb35a1b 1, 920, 920, 0, 74, 0x6ba01e89 1, 940, 940, 0, 74, 0x621421eb -0, 959, 959, 41, 179, 0x1b245f55 +0, 959, 959, 42, 179, 0x1b245f55 1, 960, 960, 0, 74, 0x26672424 1, 980, 980, 0, 74, 0xcb6120f4 diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode index 90bbd52bde..b92963f9dc 100644 --- a/tests/ref/fate/matroska-qt-mode +++ b/tests/ref/fate/matroska-qt-mode @@ -11,114 +11,114 @@ bab6f4122a60a0d4e192fb93c17a5464 *tests/data/fate/matroska-qt-mode.matroska #codec_id 1: pcm_u8 #sample_rate 1: 22050 #channel_layout_name 1: mono -0, 0, 0, 66, 3340, 0xcdb26464 +0, 0, 0, 67, 3340, 0xcdb26464 1, 0, 0, 46, 1024, 0x3c0f001e 1, 46, 46, 46, 1024, 0x5772fef7 -0, 67, 67, 66, 76, 0xc93b1f74, F=0x0 +0, 67, 67, 67, 76, 0xc93b1f74, F=0x0 1, 93, 93, 46, 1024, 0xa98efec4 -0, 133, 133, 66, 116, 0x5688353c, F=0x0 +0, 133, 133, 67, 116, 0x5688353c, F=0x0 1, 139, 139, 46, 1024, 0xba56fd5d 1, 186, 186, 46, 1024, 0x69d7063c -0, 200, 200, 66, 112, 0xbe8f3086, F=0x0 +0, 200, 200, 67, 112, 0xbe8f3086, F=0x0 1, 232, 232, 46, 1024, 0x2b67fc5a -0, 267, 267, 66, 132, 0xd0cd3b9c, F=0x0 +0, 267, 267, 67, 132, 0xd0cd3b9c, F=0x0 1, 279, 279, 46, 1024, 0xcdf9022d 1, 325, 325, 46, 1024, 0x91f6fd81 -0, 333, 333, 66, 200, 0x42385725, F=0x0 +0, 333, 333, 67, 200, 0x42385725, F=0x0 1, 372, 372, 46, 1024, 0x920eff99 -0, 400, 400, 66, 164, 0x2d344be3, F=0x0 +0, 400, 400, 67, 164, 0x2d344be3, F=0x0 1, 418, 418, 46, 1024, 0x09a2ff2b 1, 464, 464, 35, 785, 0x6ece8797 -0, 467, 467, 66, 176, 0xc97c53ff, F=0x0 +0, 467, 467, 67, 176, 0xc97c53ff, F=0x0 1, 500, 500, 46, 1024, 0x9a50fc54 -0, 533, 533, 66, 216, 0x62fe5cf9, F=0x0 +0, 533, 533, 67, 216, 0x62fe5cf9, F=0x0 1, 546, 546, 46, 1024, 0xc5ef006e 1, 593, 593, 46, 1024, 0x53430734 -0, 600, 600, 66, 164, 0x52564b48, F=0x0 +0, 600, 600, 67, 164, 0x52564b48, F=0x0 1, 639, 639, 46, 1024, 0xaaaff2dc -0, 667, 667, 66, 244, 0x25e16dfb, F=0x0 +0, 667, 667, 67, 244, 0x25e16dfb, F=0x0 1, 686, 686, 46, 1024, 0xe29a01d2 1, 732, 732, 46, 1024, 0x4deb0411 -0, 733, 733, 66, 156, 0x6abe49bf, F=0x0 +0, 733, 733, 67, 156, 0x6abe49bf, F=0x0 1, 779, 779, 46, 1024, 0x4f5dfd8d -0, 800, 800, 66, 152, 0x47f84373, F=0x0 +0, 800, 800, 67, 152, 0x47f84373, F=0x0 1, 825, 825, 46, 1024, 0x4dc5fdf1 -0, 867, 867, 66, 144, 0xe0c64013, F=0x0 +0, 867, 867, 67, 144, 0xe0c64013, F=0x0 1, 872, 872, 46, 1024, 0x7e0dff54 1, 918, 918, 46, 1024, 0xde9cff3e -0, 933, 933, 66, 280, 0xa3b57919, F=0x0 +0, 933, 933, 67, 280, 0xa3b57919, F=0x0 1, 964, 964, 35, 785, 0xfdb78def -0, 1000, 1000, 66, 3312, 0x45ee5b17 +0, 1000, 1000, 67, 3312, 0x45ee5b17 1, 1000, 1000, 46, 1024, 0x5224f542 1, 1046, 1046, 46, 1024, 0x6e61f9bc -0, 1067, 1067, 66, 324, 0x07cd8cd2, F=0x0 +0, 1067, 1067, 67, 324, 0x07cd8cd2, F=0x0 1, 1093, 1093, 46, 1024, 0x5727115f -0, 1133, 1133, 66, 364, 0x101d9883, F=0x0 +0, 1133, 1133, 67, 364, 0x101d9883, F=0x0 1, 1139, 1139, 46, 1024, 0x1b70eccb 1, 1186, 1186, 46, 1024, 0x717f0778 -0, 1200, 1200, 66, 440, 0x4628b544, F=0x0 +0, 1200, 1200, 67, 440, 0x4628b544, F=0x0 1, 1232, 1232, 46, 1024, 0xf1870091 -0, 1267, 1267, 66, 7020, 0x0a137edf +0, 1267, 1267, 67, 7020, 0x0a137edf 1, 1279, 1279, 46, 1024, 0xca1df3a7 1, 1325, 1325, 46, 1024, 0x5a921497 -0, 1333, 1333, 66, 5768, 0xc019d7b8, F=0x0 +0, 1333, 1333, 67, 5768, 0xc019d7b8, F=0x0 1, 1372, 1372, 46, 1024, 0x0655e7bf -0, 1400, 1400, 66, 4820, 0xcc946718, F=0x0 +0, 1400, 1400, 67, 4820, 0xcc946718, F=0x0 1, 1418, 1418, 46, 1024, 0x2a8a141c 1, 1464, 1464, 35, 785, 0xbd3a81a5 -0, 1467, 1467, 66, 6112, 0xbaf23f70, F=0x0 +0, 1467, 1467, 67, 6112, 0xbaf23f70, F=0x0 1, 1500, 1500, 46, 1024, 0x54b5fc77 -0, 1533, 1533, 66, 6112, 0xc79655d0, F=0x0 +0, 1533, 1533, 67, 6112, 0xc79655d0, F=0x0 1, 1546, 1546, 46, 1024, 0x8febfbc1 1, 1593, 1593, 46, 1024, 0x8ef8f1c1 -0, 1600, 1600, 66, 5112, 0x1d8fe26b, F=0x0 +0, 1600, 1600, 67, 5112, 0x1d8fe26b, F=0x0 1, 1639, 1639, 46, 1024, 0x565817aa -0, 1667, 1667, 66, 5872, 0x162eed4d, F=0x0 +0, 1667, 1667, 67, 5872, 0x162eed4d, F=0x0 1, 1686, 1686, 46, 1024, 0xfdd7ef74 1, 1732, 1732, 46, 1024, 0x69080694 -0, 1733, 1733, 66, 5092, 0x6ce7e2aa, F=0x0 +0, 1733, 1733, 67, 5092, 0x6ce7e2aa, F=0x0 1, 1779, 1779, 46, 1024, 0xe4a105c3 -0, 1800, 1800, 66, 5648, 0xfa739b01, F=0x0 +0, 1800, 1800, 67, 5648, 0xfa739b01, F=0x0 1, 1825, 1825, 46, 1024, 0x1397f5e1 -0, 1867, 1867, 66, 5516, 0x8a778b2b, F=0x0 +0, 1867, 1867, 67, 5516, 0x8a778b2b, F=0x0 1, 1872, 1872, 46, 1024, 0xb298fc7a 1, 1918, 1918, 46, 1024, 0x2869030a -0, 1933, 1933, 66, 5088, 0xdd60e51e, F=0x0 +0, 1933, 1933, 67, 5088, 0xdd60e51e, F=0x0 1, 1964, 1964, 35, 785, 0xf6a49164 -0, 2000, 2000, 66, 5808, 0x14b6e8b3, F=0x0 +0, 2000, 2000, 67, 5808, 0x14b6e8b3, F=0x0 1, 2000, 2000, 46, 1024, 0x668ce4db 1, 2046, 2046, 46, 1024, 0x08c71cd7 -0, 2067, 2067, 66, 4512, 0x9efdf756, F=0x0 +0, 2067, 2067, 67, 4512, 0x9efdf756, F=0x0 1, 2093, 2093, 46, 1024, 0xc682e3f3 -0, 2133, 2133, 66, 5404, 0x50ce47a2, F=0x0 +0, 2133, 2133, 67, 5404, 0x50ce47a2, F=0x0 1, 2139, 2139, 46, 1024, 0x98bc11c5 1, 2186, 2186, 46, 1024, 0x4a6ef47d -0, 2200, 2200, 66, 5732, 0x7b46abbf, F=0x0 +0, 2200, 2200, 67, 5732, 0x7b46abbf, F=0x0 1, 2232, 2232, 46, 1024, 0xa6660535 -0, 2267, 2267, 66, 6936, 0x325421f1 +0, 2267, 2267, 67, 6936, 0x325421f1 1, 2279, 2279, 46, 1024, 0xa1d1fd9d 1, 2325, 2325, 46, 1024, 0xf012fbf3 -0, 2333, 2333, 66, 5780, 0x8eb1d896, F=0x0 +0, 2333, 2333, 67, 5780, 0x8eb1d896, F=0x0 1, 2372, 2372, 46, 1024, 0xacc00616 -0, 2400, 2400, 66, 2280, 0x3a778e69 +0, 2400, 2400, 67, 2280, 0x3a778e69 1, 2418, 2418, 46, 1024, 0xc8660aac 1, 2464, 2464, 35, 785, 0xe9416835 -0, 2467, 2467, 66, 1220, 0x676b10f0, F=0x0 +0, 2467, 2467, 67, 1220, 0x676b10f0, F=0x0 1, 2500, 2500, 46, 1024, 0xe31622b5 -0, 2533, 2533, 66, 1584, 0x668b6e9e, F=0x0 +0, 2533, 2533, 67, 1584, 0x668b6e9e, F=0x0 1, 2546, 2546, 46, 1024, 0xc53ee0b8 1, 2593, 2593, 46, 1024, 0xf26d1102 -0, 2600, 2600, 66, 1084, 0xbdf4ca3d, F=0x0 +0, 2600, 2600, 67, 1084, 0xbdf4ca3d, F=0x0 1, 2639, 2639, 46, 1024, 0xd2fffa3d -0, 2667, 2667, 66, 1612, 0xd9f3817a, F=0x0 +0, 2667, 2667, 67, 1612, 0xd9f3817a, F=0x0 1, 2686, 2686, 46, 1024, 0x584f0189 1, 2732, 2732, 46, 1024, 0xb765fce5 -0, 2733, 2733, 66, 1696, 0x91ceac8b, F=0x0 +0, 2733, 2733, 67, 1696, 0x91ceac8b, F=0x0 1, 2779, 2779, 46, 1024, 0x570dfe8b -0, 2800, 2800, 66, 1532, 0x0b2a7bf1, F=0x0 +0, 2800, 2800, 67, 1532, 0x0b2a7bf1, F=0x0 1, 2825, 2825, 46, 1024, 0x2aa7ff16 -0, 2867, 2867, 66, 2072, 0x3daf2859, F=0x0 +0, 2867, 2867, 67, 2072, 0x3daf2859, F=0x0 1, 2872, 2872, 46, 1024, 0x5174fe72 1, 2918, 2918, 46, 1024, 0x21b302d0 -0, 2933, 2933, 66, 1568, 0xbd4d7e64, F=0x0 +0, 2933, 2933, 67, 1568, 0xbd4d7e64, F=0x0 1, 2964, 2964, 35, 785, 0x88b67dcd diff --git a/tests/ref/fate/mkv b/tests/ref/fate/mkv index d3dfef76b1..f682d904eb 100644 --- a/tests/ref/fate/mkv +++ b/tests/ref/fate/mkv @@ -10,218 +10,218 @@ #codec_id 1: aac #sample_rate 1: 48000 #channel_layout_name 1: stereo -0, -42, 0, 41, 63501, 0x139d4c99 -0, 0, 84, 41, 5368, 0xd964b678, F=0x0 +0, -42, 0, 42, 63501, 0x139d4c99 +0, 0, 84, 42, 5368, 0xd964b678, F=0x0 1, 8, 8, 21, 528, 0x3c990ddf 1, 29, 29, 21, 510, 0xc16e0719 -0, 42, 42, 41, 1840, 0x097b6726, F=0x0 -1, 50, 50, 21, 500, 0x6248f603 -1, 71, 71, 22, 491, 0xe767f705 -0, 84, 167, 41, 7168, 0xaa5913ed, F=0x0 +0, 42, 42, 42, 1840, 0x097b6726, F=0x0 +1, 50, 50, 22, 500, 0x6248f603 +1, 72, 72, 21, 491, 0xe767f705 +0, 84, 167, 42, 7168, 0xaa5913ed, F=0x0 1, 93, 93, 21, 506, 0x4340f3f3 -1, 114, 114, 21, 492, 0xf11c0210 -0, 125, 125, 41, 2129, 0x6ab0db3e, F=0x0 -1, 135, 135, 21, 502, 0x314b007e -1, 156, 156, 22, 507, 0x76de0162 -0, 167, 250, 41, 7230, 0x3fd63940, F=0x0 +1, 114, 114, 22, 492, 0xf11c0210 +0, 125, 125, 42, 2129, 0x6ab0db3e, F=0x0 +1, 136, 136, 21, 502, 0x314b007e +1, 157, 157, 22, 507, 0x76de0162 +0, 167, 250, 42, 7230, 0x3fd63940, F=0x0 1, 179, 179, 21, 501, 0x0538fa45 1, 200, 200, 21, 521, 0xc89f06d2 -0, 209, 209, 41, 2114, 0xfceafb26, F=0x0 -1, 221, 221, 21, 646, 0x8d8d3599 -1, 242, 242, 22, 661, 0x222242de -0, 250, 334, 41, 63420, 0x5ca6250f, F=0x0 +0, 209, 209, 42, 2114, 0xfceafb26, F=0x0 +1, 221, 221, 22, 646, 0x8d8d3599 +1, 243, 243, 21, 661, 0x222242de +0, 250, 334, 42, 63420, 0x5ca6250f, F=0x0 1, 264, 264, 21, 609, 0xc0dc255c -1, 285, 285, 21, 619, 0x9ac52dd1 -0, 292, 292, 41, 16751, 0xf293ab46, F=0x0 -1, 306, 306, 21, 574, 0xf6410d4d -1, 327, 327, 22, 565, 0xfd561191 -0, 334, 417, 41, 22029, 0x3696462b, F=0x0 +1, 285, 285, 22, 619, 0x9ac52dd1 +0, 292, 292, 42, 16751, 0xf293ab46, F=0x0 +1, 307, 307, 21, 574, 0xf6410d4d +1, 328, 328, 22, 565, 0xfd561191 +0, 334, 417, 42, 22029, 0x3696462b, F=0x0 1, 350, 350, 21, 713, 0x48425147 1, 371, 371, 21, 537, 0x09bbf515 -0, 375, 375, 41, 5044, 0xa0344ae6, F=0x0 -1, 392, 392, 21, 486, 0x7946e28c -1, 413, 413, 22, 499, 0xa770f22a -0, 417, 500, 41, 25289, 0x46f9a219, F=0x0 +0, 375, 375, 42, 5044, 0xa0344ae6, F=0x0 +1, 392, 392, 22, 486, 0x7946e28c +1, 414, 414, 21, 499, 0xa770f22a +0, 417, 500, 42, 25289, 0x46f9a219, F=0x0 1, 435, 435, 21, 506, 0x355ef81d -1, 456, 456, 21, 474, 0x6d24e2c5 -0, 459, 459, 41, 12871, 0x23e570c4, F=0x0 -1, 477, 477, 21, 494, 0x7d77e90f -1, 498, 498, 22, 524, 0x6c82fdd2 -0, 500, 584, 41, 29580, 0xd051ad0c, F=0x0 +1, 456, 456, 22, 474, 0x6d24e2c5 +0, 459, 459, 42, 12871, 0x23e570c4, F=0x0 +1, 478, 478, 21, 494, 0x7d77e90f +1, 499, 499, 22, 524, 0x6c82fdd2 +0, 500, 584, 42, 29580, 0xd051ad0c, F=0x0 1, 520, 520, 21, 482, 0xe625f255 1, 541, 541, 21, 533, 0xed00fd16 -0, 542, 542, 41, 9221, 0xfa1bdf6c, F=0x0 -1, 562, 562, 21, 524, 0x65cdf879 -1, 583, 583, 22, 533, 0xee26f570 -0, 584, 667, 41, 22238, 0x4e0daf3e, F=0x0 +0, 542, 542, 42, 9221, 0xfa1bdf6c, F=0x0 +1, 562, 562, 22, 524, 0x65cdf879 +0, 584, 667, 42, 22238, 0x4e0daf3e, F=0x0 +1, 584, 584, 21, 533, 0xee26f570 1, 605, 605, 21, 621, 0xed9f23cc -0, 625, 625, 41, 7627, 0xc566337e, F=0x0 -1, 626, 626, 21, 400, 0xe4fdb43a -1, 647, 647, 21, 428, 0xd7eacd61 -0, 667, 750, 41, 23124, 0x3bad1f16, F=0x0 -1, 668, 668, 22, 442, 0xef1fda0b +0, 625, 625, 42, 7627, 0xc566337e, F=0x0 +1, 626, 626, 22, 400, 0xe4fdb43a +1, 648, 648, 21, 428, 0xd7eacd61 +0, 667, 750, 42, 23124, 0x3bad1f16, F=0x0 +1, 669, 669, 22, 442, 0xef1fda0b 1, 691, 691, 21, 450, 0x1c58e44b -0, 709, 709, 41, 7093, 0x3ab77cce, F=0x0 +0, 709, 709, 42, 7093, 0x3ab77cce, F=0x0 1, 712, 712, 21, 487, 0x0e5feab7 -1, 733, 733, 21, 465, 0x984adca9 -0, 750, 834, 41, 23210, 0xa7851bbf, F=0x0 -1, 754, 754, 22, 479, 0x0960e535 +1, 733, 733, 22, 465, 0x984adca9 +0, 750, 834, 42, 23210, 0xa7851bbf, F=0x0 +1, 755, 755, 21, 479, 0x0960e535 1, 776, 776, 21, 489, 0x2f3ffc02 -0, 792, 792, 41, 16045, 0x33039eb5, F=0x0 -1, 797, 797, 21, 505, 0x541aff95 -1, 818, 818, 21, 485, 0xb7a5e7f8 -0, 834, 917, 41, 24859, 0x317ea0f2, F=0x0 -1, 839, 839, 22, 537, 0xb0dd1072 +0, 792, 792, 42, 16045, 0x33039eb5, F=0x0 +1, 797, 797, 22, 505, 0x541aff95 +1, 819, 819, 21, 485, 0xb7a5e7f8 +0, 834, 917, 42, 24859, 0x317ea0f2, F=0x0 +1, 840, 840, 22, 537, 0xb0dd1072 1, 862, 862, 21, 485, 0x6e9eee58 -0, 875, 875, 41, 7589, 0x02a8e5d5, F=0x0 +0, 875, 875, 42, 7589, 0x02a8e5d5, F=0x0 1, 883, 883, 21, 480, 0x0a6fec0b -1, 904, 904, 21, 496, 0x6ff8ee65 -0, 917, 959, 41, 19208, 0xdfb1a109, F=0x0 -1, 925, 925, 21, 505, 0x75a308b8 -1, 946, 946, 21, 512, 0x9628f3da -0, 959, 2000, 41, 60241, 0x43fcc627 -1, 967, 967, 22, 506, 0xefc901cf +1, 904, 904, 22, 496, 0x6ff8ee65 +0, 917, 959, 42, 19208, 0xdfb1a109, F=0x0 +1, 926, 926, 21, 505, 0x75a308b8 +1, 947, 947, 21, 512, 0x9628f3da +0, 959, 2000, 42, 60241, 0x43fcc627 +1, 968, 968, 22, 506, 0xefc901cf 1, 990, 990, 21, 487, 0x1fd3edc8 -1, 1011, 1011, 21, 485, 0x8ccde513 +1, 1011, 1011, 22, 485, 0x8ccde513 1, 1993, 1993, 21, 459, 0x725ede33 -0, 2000, 2084, 41, 23528, 0xc1dd888a, F=0x0 +0, 2000, 2084, 42, 23528, 0xc1dd888a, F=0x0 1, 2014, 2014, 21, 481, 0x2cd7e611 1, 2035, 2035, 21, 473, 0x14f2d777 -0, 2042, 2042, 41, 9206, 0x8f8cb89b, F=0x0 -1, 2056, 2056, 21, 543, 0x0f6dfccf -1, 2077, 2077, 22, 489, 0x8049f5df -0, 2084, 2167, 41, 34864, 0x3a343fe0, F=0x0 +0, 2042, 2042, 42, 9206, 0x8f8cb89b, F=0x0 +1, 2056, 2056, 22, 543, 0x0f6dfccf +1, 2078, 2078, 21, 489, 0x8049f5df +0, 2084, 2167, 42, 34864, 0x3a343fe0, F=0x0 1, 2099, 2099, 21, 480, 0xaa82edfc -1, 2120, 2120, 21, 505, 0xea87f3e9 -0, 2125, 2125, 41, 12516, 0x885c8e4d, F=0x0 -1, 2141, 2141, 21, 474, 0x0760e6a1 -1, 2162, 2162, 22, 547, 0xcde40a72 -0, 2167, 2250, 41, 21215, 0x4428040b, F=0x0 +1, 2120, 2120, 22, 505, 0xea87f3e9 +0, 2125, 2125, 42, 12516, 0x885c8e4d, F=0x0 +1, 2142, 2142, 21, 474, 0x0760e6a1 +1, 2163, 2163, 22, 547, 0xcde40a72 +0, 2167, 2250, 42, 21215, 0x4428040b, F=0x0 1, 2184, 2184, 21, 606, 0x4e401ec6 1, 2205, 2205, 21, 611, 0xd13e18b6 -0, 2209, 2209, 41, 11811, 0xfe46f6c7, F=0x0 -1, 2226, 2226, 21, 492, 0xe2a3ea95 -1, 2247, 2247, 22, 582, 0x15fe1df5 -0, 2250, 2334, 41, 18643, 0xdcd87177, F=0x0 +0, 2209, 2209, 42, 11811, 0xfe46f6c7, F=0x0 +1, 2226, 2226, 22, 492, 0xe2a3ea95 +1, 2248, 2248, 21, 582, 0x15fe1df5 +0, 2250, 2334, 42, 18643, 0xdcd87177, F=0x0 1, 2269, 2269, 21, 455, 0x3753cfd3 -1, 2290, 2290, 21, 467, 0x9342cfed -0, 2292, 2292, 41, 4578, 0x0bacbdaf, F=0x0 -1, 2311, 2311, 21, 422, 0x080ec43e -1, 2332, 2332, 22, 466, 0xefb8e9aa -0, 2334, 2417, 41, 25403, 0x49348e8b, F=0x0 +1, 2290, 2290, 22, 467, 0x9342cfed +0, 2292, 2292, 42, 4578, 0x0bacbdaf, F=0x0 +1, 2312, 2312, 21, 422, 0x080ec43e +1, 2333, 2333, 22, 466, 0xefb8e9aa +0, 2334, 2417, 42, 25403, 0x49348e8b, F=0x0 1, 2355, 2355, 21, 482, 0x2455e264 -0, 2375, 2375, 41, 7254, 0xe5c672b9, F=0x0 +0, 2375, 2375, 42, 7254, 0xe5c672b9, F=0x0 1, 2376, 2376, 21, 471, 0xb370df1e -1, 2397, 2397, 21, 461, 0x01addfe6 -0, 2417, 2500, 41, 25215, 0x1149c259, F=0x0 -1, 2418, 2418, 22, 566, 0x93760a5d +1, 2397, 2397, 22, 461, 0x01addfe6 +0, 2417, 2500, 42, 25215, 0x1149c259, F=0x0 +1, 2419, 2419, 21, 566, 0x93760a5d 1, 2440, 2440, 21, 618, 0x4e8e2f95 -0, 2459, 2459, 41, 14257, 0x38956a4d, F=0x0 -1, 2461, 2461, 21, 612, 0xc79128bc -1, 2482, 2482, 21, 594, 0x169d1975 -0, 2500, 2584, 41, 36619, 0xca6497c5, F=0x0 -1, 2503, 2503, 22, 488, 0xb218e907 +0, 2459, 2459, 42, 14257, 0x38956a4d, F=0x0 +1, 2461, 2461, 22, 612, 0xc79128bc +1, 2483, 2483, 21, 594, 0x169d1975 +0, 2500, 2584, 42, 36619, 0xca6497c5, F=0x0 +1, 2504, 2504, 22, 488, 0xb218e907 1, 2526, 2526, 21, 437, 0xb180c83f -0, 2542, 2542, 41, 13152, 0x4ea52247, F=0x0 +0, 2542, 2542, 42, 13152, 0x4ea52247, F=0x0 1, 2547, 2547, 21, 432, 0x85f8cf2b -1, 2568, 2568, 21, 469, 0x65d0e38e -0, 2584, 2667, 41, 31751, 0xb0140e79, F=0x0 -1, 2589, 2589, 22, 473, 0xb4dee328 +1, 2568, 2568, 22, 469, 0x65d0e38e +0, 2584, 2667, 42, 31751, 0xb0140e79, F=0x0 +1, 2590, 2590, 21, 473, 0xb4dee328 1, 2611, 2611, 21, 462, 0xd95cd547 -0, 2625, 2625, 41, 13619, 0x97308292, F=0x0 -1, 2632, 2632, 21, 470, 0x3638f48d -1, 2653, 2653, 21, 558, 0x93c3121b -0, 2667, 2750, 41, 32851, 0x014d2abc, F=0x0 -1, 2674, 2674, 22, 486, 0x5983ed52 +0, 2625, 2625, 42, 13619, 0x97308292, F=0x0 +1, 2632, 2632, 22, 470, 0x3638f48d +1, 2654, 2654, 21, 558, 0x93c3121b +0, 2667, 2750, 42, 32851, 0x014d2abc, F=0x0 +1, 2675, 2675, 22, 486, 0x5983ed52 1, 2696, 2696, 21, 507, 0x572af3c3 -0, 2709, 2709, 41, 16915, 0x3597bc67, F=0x0 +0, 2709, 2709, 42, 16915, 0x3597bc67, F=0x0 1, 2717, 2717, 21, 480, 0xe3b3e16c -1, 2738, 2738, 21, 492, 0x9443f00e -0, 2750, 2834, 41, 35380, 0x728cd77a, F=0x0 -1, 2759, 2759, 22, 480, 0x7845ea30 +1, 2738, 2738, 22, 492, 0x9443f00e +0, 2750, 2834, 42, 35380, 0x728cd77a, F=0x0 +1, 2760, 2760, 21, 480, 0x7845ea30 1, 2781, 2781, 21, 480, 0x7d01e1a2 -0, 2792, 2792, 41, 12780, 0x84c38c29, F=0x0 -1, 2802, 2802, 21, 505, 0x17d6f18b -1, 2823, 2823, 21, 506, 0xca09ee14 -0, 2834, 2917, 41, 26049, 0x3788982a, F=0x0 -1, 2844, 2844, 22, 479, 0x0383f05a +0, 2792, 2792, 42, 12780, 0x84c38c29, F=0x0 +1, 2802, 2802, 22, 505, 0x17d6f18b +1, 2824, 2824, 21, 506, 0xca09ee14 +0, 2834, 2917, 42, 26049, 0x3788982a, F=0x0 +1, 2845, 2845, 22, 479, 0x0383f05a 1, 2867, 2867, 21, 499, 0xa3b5e804 -0, 2875, 2875, 41, 11796, 0x0cbff503, F=0x0 +0, 2875, 2875, 42, 11796, 0x0cbff503, F=0x0 1, 2888, 2888, 21, 494, 0x0970e72e -1, 2909, 2909, 21, 484, 0x6f34da96 -0, 2917, 2959, 41, 16638, 0x097c9345, F=0x0 -1, 2930, 2930, 21, 492, 0x5282e9aa -1, 2951, 2951, 21, 487, 0x6f19e15e -0, 2959, 3000, 41, 64129, 0xc13b91ac -1, 2972, 2972, 22, 500, 0x17aef81a +1, 2909, 2909, 22, 484, 0x6f34da96 +0, 2917, 2959, 42, 16638, 0x097c9345, F=0x0 +1, 2931, 2931, 21, 492, 0x5282e9aa +1, 2952, 2952, 21, 487, 0x6f19e15e +0, 2959, 3000, 42, 64129, 0xc13b91ac +1, 2973, 2973, 22, 500, 0x17aef81a 1, 2995, 2995, 21, 510, 0xa323f6e6 -0, 3000, 3084, 41, 19338, 0xfe901382, F=0x0 -1, 3016, 3016, 21, 492, 0x49d7e74f +0, 3000, 3084, 42, 19338, 0xfe901382, F=0x0 +1, 3016, 3016, 22, 492, 0x49d7e74f 1, 3038, 3038, 21, 483, 0xa78deadb -0, 3042, 3042, 41, 4643, 0x5a05768b, F=0x0 +0, 3042, 3042, 42, 4643, 0x5a05768b, F=0x0 1, 3059, 3059, 21, 639, 0xf2c237e9 -1, 3080, 3080, 21, 661, 0xcd604711 -0, 3084, 3167, 41, 25932, 0x395e1d01, F=0x0 -1, 3101, 3101, 22, 647, 0xb8ee3acf +1, 3080, 3080, 22, 661, 0xcd604711 +0, 3084, 3167, 42, 25932, 0x395e1d01, F=0x0 +1, 3102, 3102, 21, 647, 0xb8ee3acf 1, 3123, 3123, 21, 575, 0x3303118e -0, 3125, 3125, 41, 5301, 0x2aacb15c, F=0x0 -1, 3144, 3144, 21, 506, 0x2063eef7 -1, 3165, 3165, 21, 518, 0x7661f08e -0, 3167, 3250, 41, 24089, 0x5cf78354, F=0x0 -1, 3186, 3186, 22, 534, 0x2858f90e +0, 3125, 3125, 42, 5301, 0x2aacb15c, F=0x0 +1, 3144, 3144, 22, 506, 0x2063eef7 +1, 3166, 3166, 21, 518, 0x7661f08e +0, 3167, 3250, 42, 24089, 0x5cf78354, F=0x0 +1, 3187, 3187, 22, 534, 0x2858f90e 1, 3208, 3208, 21, 520, 0xd596f460 -0, 3209, 3209, 41, 5837, 0x1c16cfad, F=0x0 +0, 3209, 3209, 42, 5837, 0x1c16cfad, F=0x0 1, 3229, 3229, 21, 496, 0xc2a6efed -0, 3250, 3334, 41, 26754, 0x4cf1ad04, F=0x0 -1, 3250, 3250, 21, 470, 0xcff5e778 -1, 3271, 3271, 22, 476, 0xcb63e48a -0, 3292, 3292, 41, 11067, 0x8b0b776f, F=0x0 +0, 3250, 3334, 42, 26754, 0x4cf1ad04, F=0x0 +1, 3250, 3250, 22, 470, 0xcff5e778 +1, 3272, 3272, 21, 476, 0xcb63e48a +0, 3292, 3292, 42, 11067, 0x8b0b776f, F=0x0 1, 3293, 3293, 21, 516, 0xaea8f74b -1, 3314, 3314, 21, 503, 0x5998f00d -0, 3334, 3417, 41, 28780, 0xc610f024, F=0x0 -1, 3335, 3335, 21, 488, 0xd818dd28 -1, 3356, 3356, 22, 495, 0x2662f5b5 -0, 3375, 3375, 41, 14863, 0xd58ed8f0, F=0x0 +1, 3314, 3314, 22, 503, 0x5998f00d +0, 3334, 3417, 42, 28780, 0xc610f024, F=0x0 +1, 3336, 3336, 21, 488, 0xd818dd28 +1, 3357, 3357, 22, 495, 0x2662f5b5 +0, 3375, 3375, 42, 14863, 0xd58ed8f0, F=0x0 1, 3379, 3379, 21, 499, 0x6884ec30 1, 3400, 3400, 21, 496, 0x556bdc0e -0, 3417, 3500, 41, 24790, 0x71e32bae, F=0x0 -1, 3421, 3421, 21, 524, 0xa756f115 -1, 3442, 3442, 22, 505, 0xd332f37b -0, 3459, 3459, 41, 9123, 0x6c72b7a3, F=0x0 +0, 3417, 3500, 42, 24790, 0x71e32bae, F=0x0 +1, 3421, 3421, 22, 524, 0xa756f115 +1, 3443, 3443, 21, 505, 0xd332f37b +0, 3459, 3459, 42, 9123, 0x6c72b7a3, F=0x0 1, 3464, 3464, 21, 494, 0xa380e41e -1, 3485, 3485, 21, 513, 0xf26bf0a9 -0, 3500, 3584, 41, 24706, 0x9bdd9247, F=0x0 -1, 3506, 3506, 21, 515, 0x28fffe2a -1, 3527, 3527, 22, 506, 0xc5a2f83c -0, 3542, 3542, 41, 8105, 0x85b8ff64, F=0x0 +1, 3485, 3485, 22, 513, 0xf26bf0a9 +0, 3500, 3584, 42, 24706, 0x9bdd9247, F=0x0 +1, 3507, 3507, 21, 515, 0x28fffe2a +1, 3528, 3528, 22, 506, 0xc5a2f83c +0, 3542, 3542, 42, 8105, 0x85b8ff64, F=0x0 1, 3550, 3550, 21, 510, 0xa10bf9c7 1, 3571, 3571, 21, 507, 0x93d1e650 -0, 3584, 3667, 41, 25402, 0xe4622ee0, F=0x0 -1, 3592, 3592, 21, 506, 0x1a36f285 -1, 3613, 3613, 22, 522, 0xd7a1f5e4 -0, 3625, 3625, 41, 9693, 0x910910bc, F=0x0 +0, 3584, 3667, 42, 25402, 0xe4622ee0, F=0x0 +1, 3592, 3592, 22, 506, 0x1a36f285 +1, 3614, 3614, 21, 522, 0xd7a1f5e4 +0, 3625, 3625, 42, 9693, 0x910910bc, F=0x0 1, 3635, 3635, 21, 511, 0x2e79fa62 -1, 3656, 3656, 21, 516, 0xfda2ef86 -0, 3667, 3750, 41, 31403, 0xff9934ee, F=0x0 -1, 3677, 3677, 21, 497, 0xd65cf156 -1, 3698, 3698, 22, 480, 0xde3be560 -0, 3709, 3709, 41, 13936, 0x9b6aec9e, F=0x0 +1, 3656, 3656, 22, 516, 0xfda2ef86 +0, 3667, 3750, 42, 31403, 0xff9934ee, F=0x0 +1, 3678, 3678, 21, 497, 0xd65cf156 +1, 3699, 3699, 22, 480, 0xde3be560 +0, 3709, 3709, 42, 13936, 0x9b6aec9e, F=0x0 1, 3720, 3720, 21, 514, 0x7d8cf49f 1, 3741, 3741, 21, 667, 0x7a483dec -0, 3750, 3834, 41, 28639, 0x620b80de, F=0x0 -1, 3762, 3762, 21, 640, 0x7cd92998 -1, 3783, 3783, 22, 504, 0xe3bbf106 -0, 3792, 3792, 41, 18769, 0xf51353c4, F=0x0 +0, 3750, 3834, 42, 28639, 0x620b80de, F=0x0 +1, 3762, 3762, 22, 640, 0x7cd92998 +1, 3784, 3784, 21, 504, 0xe3bbf106 +0, 3792, 3792, 42, 18769, 0xf51353c4, F=0x0 1, 3805, 3805, 21, 498, 0xe8c6f489 -1, 3826, 3826, 21, 489, 0x620df125 -0, 3834, 3917, 41, 30240, 0x48151fb3, F=0x0 -1, 3847, 3847, 21, 505, 0x7d73e570 -1, 3868, 3868, 22, 496, 0xc211f6c6 -0, 3875, 3875, 41, 13391, 0x4f3f112d, F=0x0 +1, 3826, 3826, 22, 489, 0x620df125 +0, 3834, 3917, 42, 30240, 0x48151fb3, F=0x0 +1, 3848, 3848, 21, 505, 0x7d73e570 +1, 3869, 3869, 22, 496, 0xc211f6c6 +0, 3875, 3875, 42, 13391, 0x4f3f112d, F=0x0 1, 3891, 3891, 21, 483, 0x126fe774 1, 3912, 3912, 21, 479, 0xac88db91 -0, 3917, 3959, 41, 19896, 0x0e667f6e, F=0x0 -1, 3933, 3933, 21, 480, 0x545df57b -1, 3954, 3954, 21, 473, 0x9a37e7ef -1, 3975, 3975, 22, 472, 0x4c8ee70d +0, 3917, 3959, 42, 19896, 0x0e667f6e, F=0x0 +1, 3933, 3933, 22, 480, 0x545df57b +1, 3955, 3955, 21, 473, 0x9a37e7ef +1, 3976, 3976, 22, 472, 0x4c8ee70d 1, 3998, 3998, 21, 508, 0x5c6bf8f3 diff --git a/tests/ref/fate/mkv-1242 b/tests/ref/fate/mkv-1242 index 1d1a227832..cf1a81aae6 100644 --- a/tests/ref/fate/mkv-1242 +++ b/tests/ref/fate/mkv-1242 @@ -10,35 +10,35 @@ #codec_id 1: aac #sample_rate 1: 48000 #channel_layout_name 1: stereo -0, -42, 0, 41, 2969, 0xa7016742 -0, 0, 42, 41, 135, 0x33af1a9e, F=0x0 +0, -42, 0, 42, 2969, 0xa7016742 +0, 0, 42, 42, 135, 0x33af1a9e, F=0x0 1, 0, 0, 21, 6, 0x027e00e8 1, 21, 21, 21, 6, 0x027e00e8 -0, 42, 83, 41, 9196, 0x24d8439f +0, 42, 83, 42, 9196, 0x24d8439f 1, 42, 42, 21, 6, 0x027e00e8 -1, 63, 63, 21, 6, 0x027e00e8 -0, 83, 125, 41, 4926, 0xd7e2e492, F=0x0 +1, 63, 63, 22, 6, 0x027e00e8 +0, 83, 125, 42, 4926, 0xd7e2e492, F=0x0 1, 85, 85, 21, 6, 0x027e00e8 1, 106, 106, 21, 24, 0x886f0c1f -0, 125, 167, 41, 11069, 0x44839c66 +0, 125, 167, 42, 11069, 0x44839c66 1, 127, 127, 21, 550, 0xf863059c 1, 148, 148, 22, 596, 0x32d414c1 -0, 167, 250, 41, 6143, 0xc25343dd, F=0x0 +0, 167, 250, 42, 6143, 0xc25343dd, F=0x0 1, 171, 171, 21, 247, 0x2d0776c9 1, 192, 192, 21, 264, 0xf04a7b44 -0, 209, 209, 41, 4197, 0x3b9f74ad, F=0x0 -1, 213, 213, 21, 251, 0xc7628539 -1, 234, 234, 22, 243, 0x99ef768b -0, 250, 334, 41, 17595, 0x1e502128, F=0x0 +0, 209, 209, 42, 4197, 0x3b9f74ad, F=0x0 +1, 213, 213, 22, 251, 0xc7628539 +1, 235, 235, 21, 243, 0x99ef768b +0, 250, 334, 42, 17595, 0x1e502128, F=0x0 1, 256, 256, 21, 257, 0x233f7ccc -1, 277, 277, 21, 264, 0x7d9f7bd9 -0, 292, 292, 41, 741, 0xe6b94afc, F=0x0 -1, 298, 298, 21, 298, 0x51478f98 -1, 319, 319, 22, 323, 0x419d9938 -0, 334, 417, 41, 16138, 0xba72f2fe, F=0x0 +1, 277, 277, 22, 264, 0x7d9f7bd9 +0, 292, 292, 42, 741, 0xe6b94afc, F=0x0 +1, 299, 299, 21, 298, 0x51478f98 +1, 320, 320, 22, 323, 0x419d9938 +0, 334, 417, 42, 16138, 0xba72f2fe, F=0x0 1, 341, 341, 21, 309, 0x6219980c 1, 362, 362, 21, 325, 0x3fb3976f -0, 375, 375, 41, 322, 0xd6bf790f, F=0x0 -1, 383, 383, 21, 325, 0xcd7a9fd6 -1, 404, 404, 22, 359, 0x6edeb91c +0, 375, 375, 42, 322, 0xd6bf790f, F=0x0 +1, 383, 383, 22, 325, 0xcd7a9fd6 +1, 405, 405, 21, 359, 0x6edeb91c 1, 426, 426, 21, 333, 0xb8999fb7 diff --git a/tests/ref/fate/mov-dovi-hvce-mkv-to-mp4 b/tests/ref/fate/mov-dovi-hvce-mkv-to-mp4 index 080b01cd88..6870b95067 100644 --- a/tests/ref/fate/mov-dovi-hvce-mkv-to-mp4 +++ b/tests/ref/fate/mov-dovi-hvce-mkv-to-mp4 @@ -1,4 +1,4 @@ -1d9ac9b893ed7e990b06fa13ebd97901 *tests/data/fate/mov-dovi-hvce-mkv-to-mp4.mp4 +12c2837b9131bb0273c4421d03d9ad4a *tests/data/fate/mov-dovi-hvce-mkv-to-mp4.mp4 668149 tests/data/fate/mov-dovi-hvce-mkv-to-mp4.mp4 #extradata 0: 187, 0x34a930cb #tb 0: 1/16000 @@ -6,7 +6,7 @@ #codec_id 0: hevc #dimensions 0: 3840x2160 #sar 0: 1/1 -0, -2000, 0, 656, 666936, 0x27d831d4 +0, -2000, 0, 672, 666936, 0x27d831d4 [STREAM] [SIDE_DATA] side_data_type=DOVI configuration record -- 2.52.0 >From 786353547c95740bcf1ddf53d13c2e2d20960bb5 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Tue, 21 Jul 2026 11:24:26 -0300 Subject: [PATCH 2/2] tests/fate/matroska: add a test for Track Timescale handling Signed-off-by: James Almer <[email protected]> --- tests/fate/matroska.mak | 4 ++++ tests/ref/fate/matroska-track-timescale | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100755 tests/ref/fate/matroska-track-timescale diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index d350b13d8b..6a98845ca2 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -271,6 +271,10 @@ fate-matroska-stereo_mode: CMD = transcode ogg $(TARGET_SAMPLES)/vp3/offset_test "-map 0 -c copy" \ "-show_entries stream_disposition=default,original,dub:stream_tags:stream_side_data_list" +# This tests that the matroska demuxer properly scales timestamps and durations using the Track Timescale element +FATE_MATROSKA-$(call FRAMECRC, MATROSKA) += fate-matroska-track-timescale +fate-matroska-track-timescale: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/tts10.mkv -c:s copy + # The following test tests the various flavours of WebVTT in WebM. # It also tests that dispositions not supported by WebM are not written diff --git a/tests/ref/fate/matroska-track-timescale b/tests/ref/fate/matroska-track-timescale new file mode 100755 index 0000000000..b09585a85f --- /dev/null +++ b/tests/ref/fate/matroska-track-timescale @@ -0,0 +1,8 @@ +#tb 0: 1/100 +#media_type 0: subtitle +#codec_id 0: subrip +0, 0, 0, 10, 1, 0x00610061 +0, 10, 10, 10, 1, 0x00620062 +0, 20, 20, 80, 1, 0x00630063 +0, 100, 100, 10, 1, 0x00640064 +0, 110, 110, 10, 1, 0x00650065 -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]