Commit efd3ff4fa5 for ffmpeg
commit efd3ff4fa51a627322eed5673c4893194a22748e
Author: Romain Beauxis <romain.beauxis@gmail.com>
Date: Thu Nov 12 12:22:53 2026 -0600
tests/fate: add tests for best-fit Matroska timestamps
Demux, remux and seek tests for Opus, AAC and Vorbis in Matroska, plus
a B-frame video remuxed next to 96 kHz audio. They record the current
millisecond timestamps.
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index abe374d75f..6bd226abf0 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -17,6 +17,30 @@ fate-matroska-remux: REF = b9c7b650349972c9dce42ab79b472917
FATE_MATROSKA-$(call FRAMECRC, MATROSKA,, VORBIS_PARSER) += fate-matroska-xiph-lacing
fate-matroska-xiph-lacing: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/xiph_lacing.mka -c:a copy
+FATE_MATROSKA-$(call FRAMECRC, MATROSKA,, OPUS_PARSER) += fate-matroska-opus-best-fit-ts
+fate-matroska-opus-best-fit-ts: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/codec_delay_opus.mkv -c copy
+
+FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, OPUS_PARSER OPUS_DECODER) += fate-matroska-opus-best-fit-ts-remux
+fate-matroska-opus-best-fit-ts-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/codec_delay_opus.mkv matroska "-c copy" "-c copy"
+
+FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, OPUS_PARSER OPUS_DECODER SETTS_BSF) += fate-matroska-opus-best-fit-ts-gap
+fate-matroska-opus-best-fit-ts-gap: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/codec_delay_opus.mkv matroska "-c copy -bsf:a setts=ts=TS+sgn(N)*100/48000/TB" "-c copy"
+
+FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, OPUS_PARSER OPUS_DECODER SETTS_BSF) += fate-matroska-opus-best-fit-ts-sample-gap
+fate-matroska-opus-best-fit-ts-sample-gap: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/codec_delay_opus.mkv matroska "-c copy -bsf:a setts=ts=TS+sgn(N)*1/48000/TB" "-c copy"
+
+FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER AAC_DECODER) += fate-matroska-aac-eld-best-fit-ts
+fate-matroska-aac-eld-best-fit-ts: CMD = transcode mov $(TARGET_SAMPLES)/aac/er_eld2000np_48_ep0.mp4 matroska "-c copy -frames:a 16" "-c copy"
+
+FATE_MATROSKA-$(call FRAMECRC, MATROSKA,, VORBIS_PARSER) += fate-matroska-vorbis-best-fit-ts
+fate-matroska-vorbis-best-fit-ts: CMD = framecrc -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -map 0:a -c copy -frames:a 50
+
+FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, PCM_S16LE, MATROSKA, H264_PARSER H264_DECODER LAVFI_INDEV SINE_FILTER) += fate-matroska-h264-pcm96k-remux
+fate-matroska-h264-pcm96k-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/test7_cut.mkv matroska "-map 0:v -map 1:a -c:v copy -c:a pcm_s16le -t 2" "-map 0:v -c copy" "" "-f lavfi -i sine=r=96000:d=2"
+
+FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-opus-best-fit-ts-seek
+fate-matroska-opus-best-fit-ts-seek: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -read_intervals 0%+\#1,1%+\#1 -show_entries packet=pts,pos -print_format compact $(TARGET_SAMPLES)/audiomatch/tones_opus_48000_stereo.mka
+
# This tests that the Matroska demuxer correctly demuxes WavPack
# without CodecPrivate; it also tests zlib compressed WavPack.
FATE_MATROSKA-$(call FRAMECRC, MATROSKA,, ZLIB) += fate-matroska-wavpack-missing-codecprivate
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 192a95b8da..60216c23be 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -184,6 +184,7 @@ FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE2PIPE)
FATE_SEEK_EXTRA-$(CONFIG_MP3_DEMUXER) += fate-seek-extra-mp3
FATE_SEEK_EXTRA-$(call ALLYES, CACHE_PROTOCOL PIPE_PROTOCOL MP3_DEMUXER) += fate-seek-cache-pipe
FATE_SEEK_EXTRA-$(CONFIG_MATROSKA_DEMUXER) += fate-seek-mkv-codec-delay
+FATE_SEEK_EXTRA-$(call ALLYES, MATROSKA_DEMUXER H264_PARSER) += fate-seek-mkv-best-fit-ts
FATE_SEEK_EXTRA-$(call ALLYES, MOV_DEMUXER) += fate-seek-extra-mp4
FATE_SEEK_EXTRA-$(call ALLYES, MOV_DEMUXER) += fate-seek-empty-edit-mp4
FATE_SEEK_EXTRA-$(call ALLYES, MOV_DEMUXER) += fate-seek-test-iibbibb-mp4
@@ -199,6 +200,7 @@ fate-seek-test-iibbibb-mp4: CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_
fate-seek-test-iibbibb-neg-ctts-mp4: CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_SAMPLES)/mov/test_iibbibb_neg_ctts.mp4 -duration 13 -frames 4
fate-seek-cache-pipe: CMD = cat $(SAMPLES)/gapless/gapless.mp3 | run libavformat/tests/seek$(EXESUF) cache:pipe:0 -read_ahead_limit -1
fate-seek-mkv-codec-delay: CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_SAMPLES)/mkv/codec_delay_opus.mkv
+fate-seek-mkv-best-fit-ts: CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_SAMPLES)/mkv/test7_cut.mkv -duration 4 -frames 3
fate-seek-sacd: CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_SAMPLES)/sacd/2ch-dsd_5ch-dst.iso -duration 2
# A master playlist with separate audio and video media playlists with different DTS.
diff --git a/tests/ref/fate/matroska-aac-eld-best-fit-ts b/tests/ref/fate/matroska-aac-eld-best-fit-ts
new file mode 100644
index 0000000000..746b936a62
--- /dev/null
+++ b/tests/ref/fate/matroska-aac-eld-best-fit-ts
@@ -0,0 +1,24 @@
+c07d16ecad08a014a2641630b9288a01 *tests/data/fate/matroska-aac-eld-best-fit-ts.matroska
+3456 tests/data/fate/matroska-aac-eld-best-fit-ts.matroska
+#extradata 0: 4, 0x0712021e
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 48000
+#channel_layout_name 0: stereo
+0, 0, 0, 11, 208, 0x01cb6153
+0, 11, 11, 11, 216, 0x7b266a4e
+0, 21, 21, 11, 210, 0x106e61d9
+0, 32, 32, 11, 184, 0xd84b5363
+0, 43, 43, 11, 209, 0xd41c6270
+0, 53, 53, 11, 189, 0x611159bb
+0, 64, 64, 11, 181, 0x74155462
+0, 75, 75, 11, 173, 0x9e3152a4
+0, 85, 85, 11, 175, 0x6ffc54b7
+0, 96, 96, 11, 159, 0xf64e4b48
+0, 107, 107, 11, 169, 0xa8274c8c
+0, 117, 117, 11, 157, 0x1d9a4ce8
+0, 128, 128, 11, 157, 0xfc8549d6
+0, 139, 139, 11, 156, 0xe58744bc
+0, 149, 149, 11, 160, 0x38e84c54
+0, 160, 160, 11, 162, 0xe4744b27
diff --git a/tests/ref/fate/matroska-h264-pcm96k-remux b/tests/ref/fate/matroska-h264-pcm96k-remux
new file mode 100644
index 0000000000..0ef96a4322
--- /dev/null
+++ b/tests/ref/fate/matroska-h264-pcm96k-remux
@@ -0,0 +1,33 @@
+8ce6b406f67a8dc76d7bf54575999f08 *tests/data/fate/matroska-h264-pcm96k-remux.matroska
+871259 tests/data/fate/matroska-h264-pcm96k-remux.matroska
+#extradata 0: 35, 0xc3b20b70
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 1024x576
+#sar 0: 1/1
+0, -42, 0, 42, 63501, 0x139d4c99
+0, 0, 84, 42, 5368, 0xd964b678, F=0x0
+0, 42, 42, 42, 1840, 0x097b6726, F=0x0
+0, 84, 167, 42, 7168, 0xaa5913ed, F=0x0
+0, 125, 125, 42, 2129, 0x6ab0db3e, F=0x0
+0, 167, 250, 42, 7230, 0x3fd63940, F=0x0
+0, 209, 209, 42, 2114, 0xfceafb26, F=0x0
+0, 250, 334, 42, 63420, 0x5ca6250f, F=0x0
+0, 292, 292, 42, 16751, 0xf293ab46, F=0x0
+0, 334, 417, 42, 22029, 0x3696462b, F=0x0
+0, 375, 375, 42, 5044, 0xa0344ae6, F=0x0
+0, 417, 500, 42, 25289, 0x46f9a219, F=0x0
+0, 459, 459, 42, 12871, 0x23e570c4, F=0x0
+0, 500, 584, 42, 29580, 0xd051ad0c, F=0x0
+0, 542, 542, 42, 9221, 0xfa1bdf6c, F=0x0
+0, 584, 667, 42, 22238, 0x4e0daf3e, F=0x0
+0, 625, 625, 42, 7627, 0xc566337e, F=0x0
+0, 667, 750, 42, 23124, 0x3bad1f16, F=0x0
+0, 709, 709, 42, 7093, 0x3ab77cce, F=0x0
+0, 750, 834, 42, 23210, 0xa7851bbf, F=0x0
+0, 792, 792, 42, 16045, 0x33039eb5, F=0x0
+0, 834, 917, 42, 24859, 0x317ea0f2, F=0x0
+0, 875, 875, 42, 7589, 0x02a8e5d5, F=0x0
+0, 917, 959, 42, 19208, 0xdfb1a109, F=0x0
+0, 959, 2000, 42, 60241, 0x43fcc627
diff --git a/tests/ref/fate/matroska-opus-best-fit-ts b/tests/ref/fate/matroska-opus-best-fit-ts
new file mode 100644
index 0000000000..e18329417e
--- /dev/null
+++ b/tests/ref/fate/matroska-opus-best-fit-ts
@@ -0,0 +1,58 @@
+#extradata 0: 19, 0x3a04048f
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: opus
+#sample_rate 0: 48000
+#channel_layout_name 0: mono
+0, -7, -7, 20, 320, 0x58b9a88d, S=1, Skip Samples, 10, 0x02390039
+0, 14, 14, 20, 159, 0x6c9c4b4c
+0, 34, 34, 20, 148, 0x0caf4b5d
+0, 54, 54, 20, 139, 0xc5624226
+0, 74, 74, 20, 146, 0x633c4937
+0, 94, 94, 20, 153, 0x3d0b4f93
+0, 114, 114, 20, 158, 0xe5c55641
+0, 134, 134, 20, 156, 0xf2fd50ef
+0, 154, 154, 20, 158, 0x93b15410
+0, 174, 174, 20, 157, 0xb6f74f5f
+0, 194, 194, 20, 159, 0x9aff4957
+0, 214, 214, 20, 153, 0xfc5f4aba
+0, 234, 234, 20, 158, 0x01e44f70
+0, 254, 254, 20, 153, 0x227149cf
+0, 274, 274, 20, 155, 0x312f4cf6
+0, 294, 294, 20, 155, 0xafc54bae
+0, 314, 314, 20, 151, 0x7b4252b3
+0, 334, 334, 20, 155, 0x29074a75
+0, 354, 354, 20, 149, 0x82c44bcd
+0, 374, 374, 20, 150, 0x55c24eb5
+0, 394, 394, 20, 156, 0xf71d4f33
+0, 414, 414, 20, 153, 0x9b6c4ae5
+0, 434, 434, 20, 156, 0x75954e51
+0, 454, 454, 20, 155, 0x28ff4ff3
+0, 474, 474, 20, 153, 0xc4424969
+0, 494, 494, 20, 154, 0xfbf94cc8
+0, 514, 514, 20, 155, 0x52c549af
+0, 534, 534, 20, 150, 0x6f1e4b7a
+0, 554, 554, 20, 158, 0xabb45566
+0, 574, 574, 20, 157, 0xe61d4a99
+0, 594, 594, 20, 159, 0xf45d4fac
+0, 614, 614, 20, 159, 0xcd0553a5
+0, 634, 634, 20, 156, 0xdb244e63
+0, 654, 654, 20, 154, 0x78654c52
+0, 674, 674, 20, 154, 0x9f804cc8
+0, 694, 694, 20, 150, 0x1fdf4c80
+0, 714, 714, 20, 155, 0x1adc4f89
+0, 734, 734, 20, 155, 0x4b53511c
+0, 754, 754, 20, 151, 0x8ff2546d
+0, 774, 774, 20, 158, 0xb7e34f1b
+0, 794, 794, 20, 154, 0x4d98474b
+0, 814, 814, 20, 154, 0x14924ea8
+0, 834, 834, 20, 153, 0x8d4752bf
+0, 854, 854, 20, 149, 0x74785066
+0, 874, 874, 20, 151, 0x36c94a4c
+0, 894, 894, 20, 155, 0x82904f3b
+0, 914, 914, 20, 154, 0xd76b4a45
+0, 934, 934, 20, 159, 0x9fec548d
+0, 954, 954, 20, 154, 0x9a084dcd
+0, 974, 974, 20, 155, 0x90a54ac8
+0, 994, 994, 20, 324, 0x8e34a2f5
+0, 1014, 1014, 20, 268, 0x10f37203, S=1, Skip Samples, 10, 0x049600c4
diff --git a/tests/ref/fate/matroska-opus-best-fit-ts-gap b/tests/ref/fate/matroska-opus-best-fit-ts-gap
new file mode 100644
index 0000000000..0793ae7e4a
--- /dev/null
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-gap
@@ -0,0 +1,60 @@
+2dc4e25e3685b83dff1874b20a271346 *tests/data/fate/matroska-opus-best-fit-ts-gap.matroska
+9358 tests/data/fate/matroska-opus-best-fit-ts-gap.matroska
+#extradata 0: 19, 0x3a04048f
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: opus
+#sample_rate 0: 48000
+#channel_layout_name 0: mono
+0, -7, -7, 20, 320, 0x58b9a88d, S=1, Skip Samples, 10, 0x02390039
+0, 16, 16, 20, 159, 0x6c9c4b4c
+0, 36, 36, 20, 148, 0x0caf4b5d
+0, 56, 56, 20, 139, 0xc5624226
+0, 76, 76, 20, 146, 0x633c4937
+0, 96, 96, 20, 153, 0x3d0b4f93
+0, 116, 116, 20, 158, 0xe5c55641
+0, 136, 136, 20, 156, 0xf2fd50ef
+0, 156, 156, 20, 158, 0x93b15410
+0, 176, 176, 20, 157, 0xb6f74f5f
+0, 196, 196, 20, 159, 0x9aff4957
+0, 216, 216, 20, 153, 0xfc5f4aba
+0, 236, 236, 20, 158, 0x01e44f70
+0, 256, 256, 20, 153, 0x227149cf
+0, 276, 276, 20, 155, 0x312f4cf6
+0, 296, 296, 20, 155, 0xafc54bae
+0, 316, 316, 20, 151, 0x7b4252b3
+0, 336, 336, 20, 155, 0x29074a75
+0, 356, 356, 20, 149, 0x82c44bcd
+0, 376, 376, 20, 150, 0x55c24eb5
+0, 396, 396, 20, 156, 0xf71d4f33
+0, 416, 416, 20, 153, 0x9b6c4ae5
+0, 436, 436, 20, 156, 0x75954e51
+0, 456, 456, 20, 155, 0x28ff4ff3
+0, 476, 476, 20, 153, 0xc4424969
+0, 496, 496, 20, 154, 0xfbf94cc8
+0, 516, 516, 20, 155, 0x52c549af
+0, 536, 536, 20, 150, 0x6f1e4b7a
+0, 556, 556, 20, 158, 0xabb45566
+0, 576, 576, 20, 157, 0xe61d4a99
+0, 596, 596, 20, 159, 0xf45d4fac
+0, 616, 616, 20, 159, 0xcd0553a5
+0, 636, 636, 20, 156, 0xdb244e63
+0, 656, 656, 20, 154, 0x78654c52
+0, 676, 676, 20, 154, 0x9f804cc8
+0, 696, 696, 20, 150, 0x1fdf4c80
+0, 716, 716, 20, 155, 0x1adc4f89
+0, 736, 736, 20, 155, 0x4b53511c
+0, 756, 756, 20, 151, 0x8ff2546d
+0, 776, 776, 20, 158, 0xb7e34f1b
+0, 796, 796, 20, 154, 0x4d98474b
+0, 816, 816, 20, 154, 0x14924ea8
+0, 836, 836, 20, 153, 0x8d4752bf
+0, 856, 856, 20, 149, 0x74785066
+0, 876, 876, 20, 151, 0x36c94a4c
+0, 896, 896, 20, 155, 0x82904f3b
+0, 916, 916, 20, 154, 0xd76b4a45
+0, 936, 936, 20, 159, 0x9fec548d
+0, 956, 956, 20, 154, 0x9a084dcd
+0, 976, 976, 20, 155, 0x90a54ac8
+0, 996, 996, 20, 324, 0x8e34a2f5
+0, 1016, 1016, 20, 268, 0x10f37203, S=1, Skip Samples, 10, 0x049600c4
diff --git a/tests/ref/fate/matroska-opus-best-fit-ts-remux b/tests/ref/fate/matroska-opus-best-fit-ts-remux
new file mode 100644
index 0000000000..c310fc52df
--- /dev/null
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-remux
@@ -0,0 +1,60 @@
+b9881205f8945fefc16a6f23474071a6 *tests/data/fate/matroska-opus-best-fit-ts-remux.matroska
+9358 tests/data/fate/matroska-opus-best-fit-ts-remux.matroska
+#extradata 0: 19, 0x3a04048f
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: opus
+#sample_rate 0: 48000
+#channel_layout_name 0: mono
+0, -7, -7, 20, 320, 0x58b9a88d, S=1, Skip Samples, 10, 0x02390039
+0, 14, 14, 20, 159, 0x6c9c4b4c
+0, 34, 34, 20, 148, 0x0caf4b5d
+0, 54, 54, 20, 139, 0xc5624226
+0, 74, 74, 20, 146, 0x633c4937
+0, 94, 94, 20, 153, 0x3d0b4f93
+0, 114, 114, 20, 158, 0xe5c55641
+0, 134, 134, 20, 156, 0xf2fd50ef
+0, 154, 154, 20, 158, 0x93b15410
+0, 174, 174, 20, 157, 0xb6f74f5f
+0, 194, 194, 20, 159, 0x9aff4957
+0, 214, 214, 20, 153, 0xfc5f4aba
+0, 234, 234, 20, 158, 0x01e44f70
+0, 254, 254, 20, 153, 0x227149cf
+0, 274, 274, 20, 155, 0x312f4cf6
+0, 294, 294, 20, 155, 0xafc54bae
+0, 314, 314, 20, 151, 0x7b4252b3
+0, 334, 334, 20, 155, 0x29074a75
+0, 354, 354, 20, 149, 0x82c44bcd
+0, 374, 374, 20, 150, 0x55c24eb5
+0, 394, 394, 20, 156, 0xf71d4f33
+0, 414, 414, 20, 153, 0x9b6c4ae5
+0, 434, 434, 20, 156, 0x75954e51
+0, 454, 454, 20, 155, 0x28ff4ff3
+0, 474, 474, 20, 153, 0xc4424969
+0, 494, 494, 20, 154, 0xfbf94cc8
+0, 514, 514, 20, 155, 0x52c549af
+0, 534, 534, 20, 150, 0x6f1e4b7a
+0, 554, 554, 20, 158, 0xabb45566
+0, 574, 574, 20, 157, 0xe61d4a99
+0, 594, 594, 20, 159, 0xf45d4fac
+0, 614, 614, 20, 159, 0xcd0553a5
+0, 634, 634, 20, 156, 0xdb244e63
+0, 654, 654, 20, 154, 0x78654c52
+0, 674, 674, 20, 154, 0x9f804cc8
+0, 694, 694, 20, 150, 0x1fdf4c80
+0, 714, 714, 20, 155, 0x1adc4f89
+0, 734, 734, 20, 155, 0x4b53511c
+0, 754, 754, 20, 151, 0x8ff2546d
+0, 774, 774, 20, 158, 0xb7e34f1b
+0, 794, 794, 20, 154, 0x4d98474b
+0, 814, 814, 20, 154, 0x14924ea8
+0, 834, 834, 20, 153, 0x8d4752bf
+0, 854, 854, 20, 149, 0x74785066
+0, 874, 874, 20, 151, 0x36c94a4c
+0, 894, 894, 20, 155, 0x82904f3b
+0, 914, 914, 20, 154, 0xd76b4a45
+0, 934, 934, 20, 159, 0x9fec548d
+0, 954, 954, 20, 154, 0x9a084dcd
+0, 974, 974, 20, 155, 0x90a54ac8
+0, 994, 994, 20, 324, 0x8e34a2f5
+0, 1014, 1014, 20, 268, 0x10f37203, S=1, Skip Samples, 10, 0x049600c4
diff --git a/tests/ref/fate/matroska-opus-best-fit-ts-sample-gap b/tests/ref/fate/matroska-opus-best-fit-ts-sample-gap
new file mode 100644
index 0000000000..a4bab2ceb7
--- /dev/null
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-sample-gap
@@ -0,0 +1,60 @@
+b9881205f8945fefc16a6f23474071a6 *tests/data/fate/matroska-opus-best-fit-ts-sample-gap.matroska
+9358 tests/data/fate/matroska-opus-best-fit-ts-sample-gap.matroska
+#extradata 0: 19, 0x3a04048f
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: opus
+#sample_rate 0: 48000
+#channel_layout_name 0: mono
+0, -7, -7, 20, 320, 0x58b9a88d, S=1, Skip Samples, 10, 0x02390039
+0, 14, 14, 20, 159, 0x6c9c4b4c
+0, 34, 34, 20, 148, 0x0caf4b5d
+0, 54, 54, 20, 139, 0xc5624226
+0, 74, 74, 20, 146, 0x633c4937
+0, 94, 94, 20, 153, 0x3d0b4f93
+0, 114, 114, 20, 158, 0xe5c55641
+0, 134, 134, 20, 156, 0xf2fd50ef
+0, 154, 154, 20, 158, 0x93b15410
+0, 174, 174, 20, 157, 0xb6f74f5f
+0, 194, 194, 20, 159, 0x9aff4957
+0, 214, 214, 20, 153, 0xfc5f4aba
+0, 234, 234, 20, 158, 0x01e44f70
+0, 254, 254, 20, 153, 0x227149cf
+0, 274, 274, 20, 155, 0x312f4cf6
+0, 294, 294, 20, 155, 0xafc54bae
+0, 314, 314, 20, 151, 0x7b4252b3
+0, 334, 334, 20, 155, 0x29074a75
+0, 354, 354, 20, 149, 0x82c44bcd
+0, 374, 374, 20, 150, 0x55c24eb5
+0, 394, 394, 20, 156, 0xf71d4f33
+0, 414, 414, 20, 153, 0x9b6c4ae5
+0, 434, 434, 20, 156, 0x75954e51
+0, 454, 454, 20, 155, 0x28ff4ff3
+0, 474, 474, 20, 153, 0xc4424969
+0, 494, 494, 20, 154, 0xfbf94cc8
+0, 514, 514, 20, 155, 0x52c549af
+0, 534, 534, 20, 150, 0x6f1e4b7a
+0, 554, 554, 20, 158, 0xabb45566
+0, 574, 574, 20, 157, 0xe61d4a99
+0, 594, 594, 20, 159, 0xf45d4fac
+0, 614, 614, 20, 159, 0xcd0553a5
+0, 634, 634, 20, 156, 0xdb244e63
+0, 654, 654, 20, 154, 0x78654c52
+0, 674, 674, 20, 154, 0x9f804cc8
+0, 694, 694, 20, 150, 0x1fdf4c80
+0, 714, 714, 20, 155, 0x1adc4f89
+0, 734, 734, 20, 155, 0x4b53511c
+0, 754, 754, 20, 151, 0x8ff2546d
+0, 774, 774, 20, 158, 0xb7e34f1b
+0, 794, 794, 20, 154, 0x4d98474b
+0, 814, 814, 20, 154, 0x14924ea8
+0, 834, 834, 20, 153, 0x8d4752bf
+0, 854, 854, 20, 149, 0x74785066
+0, 874, 874, 20, 151, 0x36c94a4c
+0, 894, 894, 20, 155, 0x82904f3b
+0, 914, 914, 20, 154, 0xd76b4a45
+0, 934, 934, 20, 159, 0x9fec548d
+0, 954, 954, 20, 154, 0x9a084dcd
+0, 974, 974, 20, 155, 0x90a54ac8
+0, 994, 994, 20, 324, 0x8e34a2f5
+0, 1014, 1014, 20, 268, 0x10f37203, S=1, Skip Samples, 10, 0x049600c4
diff --git a/tests/ref/fate/matroska-opus-best-fit-ts-seek b/tests/ref/fate/matroska-opus-best-fit-ts-seek
new file mode 100644
index 0000000000..d3c07085e8
--- /dev/null
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-seek
@@ -0,0 +1,2 @@
+packet|pts=6770|pos=8480
+packet|pts=47345|pos=21765
diff --git a/tests/ref/fate/matroska-vorbis-best-fit-ts b/tests/ref/fate/matroska-vorbis-best-fit-ts
new file mode 100644
index 0000000000..25565fd320
--- /dev/null
+++ b/tests/ref/fate/matroska-vorbis-best-fit-ts
@@ -0,0 +1,56 @@
+#extradata 0: 4189, 0xb1440228
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: vorbis
+#sample_rate 0: 44100
+#channel_layout_name 0: stereo
+0, 0, 0, 2, 30, 0xf0be105c
+0, 13, 13, 13, 201, 0xce706659
+0, 36, 36, 23, 261, 0xc81882fc
+0, 60, 60, 23, 297, 0xff798b8f
+0, 83, 83, 23, 306, 0xc3e98717
+0, 106, 106, 23, 307, 0x659e998b
+0, 129, 129, 23, 323, 0xa975933b
+0, 152, 152, 23, 330, 0xf0fe9de6
+0, 176, 176, 23, 326, 0xda4a9824
+0, 199, 199, 23, 314, 0xf9e09d59
+0, 222, 222, 23, 340, 0x41d9a211
+0, 245, 245, 23, 381, 0x5300baaa
+0, 268, 268, 23, 391, 0xd07ab8e9
+0, 292, 292, 23, 380, 0x2ebab747
+0, 315, 315, 23, 389, 0x3d04c339
+0, 338, 338, 23, 399, 0xea86c8ff
+0, 361, 361, 23, 369, 0x8b20a951
+0, 385, 385, 23, 364, 0x3fc2abc9
+0, 408, 408, 23, 383, 0x09adbd40
+0, 431, 431, 23, 375, 0xc609a949
+0, 454, 454, 23, 392, 0xf051ba69
+0, 477, 477, 23, 386, 0xb720aecf
+0, 501, 501, 23, 368, 0x3b29ac28
+0, 524, 524, 23, 388, 0x59a8bc5b
+0, 547, 547, 23, 389, 0x1536b1f2
+0, 570, 570, 23, 391, 0x64bcbb9a
+0, 594, 594, 23, 396, 0x85ccb183
+0, 617, 617, 23, 405, 0xbb27bdab
+0, 640, 640, 23, 424, 0x537bcd9e
+0, 663, 663, 23, 410, 0xb91cc3da
+0, 686, 686, 23, 408, 0x6b43c361
+0, 710, 710, 23, 426, 0x3159cdef
+0, 733, 733, 23, 397, 0xda29b6fe
+0, 756, 756, 23, 403, 0xa23abec9
+0, 779, 779, 23, 406, 0x1f83ba74
+0, 803, 803, 23, 410, 0x58b5b572
+0, 826, 826, 23, 399, 0x8207bc36
+0, 849, 849, 23, 428, 0xecc0d812
+0, 872, 872, 23, 417, 0x42c8c5a1
+0, 895, 895, 23, 408, 0xb00dc6a6
+0, 919, 919, 23, 388, 0x2f30b899
+0, 942, 942, 23, 382, 0x8c97b097
+0, 965, 965, 23, 374, 0xf93ba92c
+0, 988, 988, 23, 373, 0x7391aaeb
+0, 1012, 1012, 23, 384, 0x5056b16d
+0, 1035, 1035, 23, 358, 0x0168a93a
+0, 1058, 1058, 23, 389, 0xe553af10
+0, 1081, 1081, 23, 371, 0xaa36acae
+0, 1104, 1104, 23, 371, 0xc990aa5c
+0, 1128, 1128, 23, 392, 0x5fcab659
diff --git a/tests/ref/seek/mkv-best-fit-ts b/tests/ref/seek/mkv-best-fit-ts
new file mode 100644
index 0000000000..f281eceb75
--- /dev/null
+++ b/tests/ref/seek/mkv-best-fit-ts
@@ -0,0 +1,107 @@
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st:-1 flags:0 ts:-1.000000
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st:-1 flags:1 ts: 1.894167
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 0 flags:0 ts: 0.788000
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 0 flags:1 ts:-0.317000
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st: 1 flags:0 ts: 2.577000
+ret: 0 st: 1 flags:1 dts: 2.696000 pts: 2.696000 pos:1369672 size: 507
+ret: 0 st: 1 flags:1 dts: 2.717000 pts: 2.717000 pos:1369672 size: 480
+ret: 0 st: 1 flags:1 dts: 2.738000 pts: 2.738000 pos:1369672 size: 492
+ret: 0 st: 1 flags:1 ts: 1.471000
+ret: 0 st: 1 flags:1 dts: 0.990000 pts: 0.990000 pos: 450438 size: 487
+ret: 0 st: 1 flags:1 dts: 1.011000 pts: 1.011000 pos: 450438 size: 485
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st:-1 flags:0 ts: 0.365002
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st:-1 flags:1 ts:-0.740831
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st: 0 flags:0 ts: 2.153000
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 3.000000 pos:1530084 size: 64129
+ret: 0 st: 1 flags:1 dts: 3.038000 pts: 3.038000 pos:1594220 size: 483
+ret: 0 st: 1 flags:1 dts: 3.059000 pts: 3.059000 pos:1594220 size: 639
+ret: 0 st: 0 flags:1 ts: 1.048000
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 1 flags:0 ts:-0.058000
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st: 1 flags:1 ts: 2.836000
+ret: 0 st: 1 flags:1 dts: 2.696000 pts: 2.696000 pos:1369672 size: 507
+ret: 0 st: 1 flags:1 dts: 2.717000 pts: 2.717000 pos:1369672 size: 480
+ret: 0 st: 1 flags:1 dts: 2.738000 pts: 2.738000 pos:1369672 size: 492
+ret: 0 st:-1 flags:0 ts: 1.730004
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 1 flags:1 dts: 2.035000 pts: 2.035000 pos:1049679 size: 473
+ret: 0 st:-1 flags:1 ts: 0.624171
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st: 0 flags:0 ts:-0.482000
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st: 0 flags:1 ts: 2.413000
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 1 flags:1 dts: 2.035000 pts: 2.035000 pos:1049679 size: 473
+ret: 0 st: 1 flags:0 ts: 1.307000
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 1 flags:1 ts: 0.201000
+ret: 0 st: 1 flags:1 dts: 0.179000 pts: 0.179000 pos: 85877 size: 501
+ret: 0 st: 1 flags:1 dts: 0.200000 pts: 0.200000 pos: 85877 size: 521
+ret: 0 st: 1 flags:1 dts: 0.221000 pts: 0.221000 pos: 85877 size: 646
+ret: 0 st:-1 flags:0 ts:-0.904994
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st:-1 flags:1 ts: 1.989173
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 0 flags:0 ts: 0.883000
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st: 0 flags:1 ts:-0.222000
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500
+ret: 0 st: 1 flags:0 ts: 2.672000
+ret: 0 st: 1 flags:1 dts: 2.696000 pts: 2.696000 pos:1369672 size: 507
+ret: 0 st: 1 flags:1 dts: 2.717000 pts: 2.717000 pos:1369672 size: 480
+ret: 0 st: 1 flags:1 dts: 2.738000 pts: 2.738000 pos:1369672 size: 492
+ret: 0 st: 1 flags:1 ts: 1.566000
+ret: 0 st: 1 flags:1 dts: 0.990000 pts: 0.990000 pos: 450438 size: 487
+ret: 0 st: 1 flags:1 dts: 1.011000 pts: 1.011000 pos: 450438 size: 485
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st:-1 flags:0 ts: 0.460008
+ret: 0 st: 1 flags:1 dts: 1.993000 pts: 1.993000 pos: 988964 size: 459
+ret: 0 st: 0 flags:1 dts: NOPTS pts: 2.000000 pos: 989431 size: 60241
+ret: 0 st: 1 flags:1 dts: 2.014000 pts: 2.014000 pos:1049679 size: 481
+ret: 0 st:-1 flags:1 ts:-0.645825
+ret: 0 st: 1 flags:1 dts: 0.008000 pts: 0.008000 pos: 1783 size: 528
+ret: 0 st: 1 flags:1 dts: 0.029000 pts: 0.029000 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050000 pts: 0.050000 pos: 1783 size: 500