Commit f6a60f3aea for ffmpeg
commit f6a60f3aeac29708745b1726d482edb6fdfad463
Author: Romain Beauxis <romain.beauxis@gmail.com>
Date: Wed Nov 18 08:52:20 2026 -0600
avformat/matroskadec: fit audio timestamps to samples with best_fit_ts
Opus, AAC and default-duration audio tracks move to a sample time base,
with timestamps counted from packet lengths. A block timestamp is
followed only where it departs from the count by more than the clock's
rounding. After a seek, packets snap to the grid of packet lengths.
Vorbis keeps the file's clock: its packet lengths vary. Tracks that keep
the clock log why at verbose level.
diff --git a/configure b/configure
index ad9b0f6bb5..89d897089e 100755
--- a/configure
+++ b/configure
@@ -3950,7 +3950,7 @@ ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf"
jpeg_mpf_demuxer_select="mjpeg_parser"
latm_muxer_select="aac_adtstoasc_bsf mpeg4audio"
matroska_audio_muxer_select="matroska_muxer"
-matroska_demuxer_select="riffdec"
+matroska_demuxer_select="mpeg4audio riffdec"
matroska_demuxer_suggest="bzlib zlib"
matroska_muxer_select="iso_writer mpeg4audio riffenc aac_adtstoasc_bsf pgs_frame_merge_bsf vp9_superframe_bsf"
mcc_demuxer_select="smpte_436m"
diff --git a/libavcodec/opus/Makefile b/libavcodec/opus/Makefile
index 49ce7fb767..08260a86da 100644
--- a/libavcodec/opus/Makefile
+++ b/libavcodec/opus/Makefile
@@ -28,5 +28,6 @@ OBJS-$(CONFIG_OPUS_ENCODER) += \
opus/rc.o \
opus/tab.o \
+STLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += opus/frame_duration_tab.o
STLIBOBJS-$(CONFIG_MATROSKA_MUXER) += opus/frame_duration_tab.o
STLIBOBJS-$(CONFIG_WEBM_MUXER) += opus/frame_duration_tab.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0da209b17e..30e3b33441 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -755,7 +755,8 @@ SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
SHLIBOBJS-$(CONFIG_JNI) += ffjni.o
SHLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
-SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
+SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o \
+ opus_frame_duration_tab.o
SHLIBOBJS-$(CONFIG_MATROSKA_MUXER) += opus_frame_duration_tab.o
SHLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o
SHLIBOBJS-$(CONFIG_MOV_MUXER) += mpegaudiotabs.o
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b3d4ea42dc..745140cebf 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -57,6 +57,7 @@
#include "libavcodec/flac.h"
#include "libavcodec/itut35.h"
#include "libavcodec/mpeg4audio.h"
+#include "libavcodec/opus/tab.h"
#include "packet_internal.h"
#include "avformat.h"
@@ -290,6 +291,23 @@ typedef struct MatroskaTrack {
AVStream *stream;
int64_t end_timecode;
int ms_compat;
+ /**
+ * best_fit_ts: the timestamps are in samples, rebuilt from the
+ * packet lengths, and the container's clock only places the first
+ * packet and the ones after a gap.
+ */
+ int exact_audio;
+ AVRational tick_tb; ///< the container's clock for this track
+ /// samples per packet when fixed, 0 to read each packet
+ int packet_samples;
+ /// the rounding of the container's clock, in samples
+ int64_t ts_tolerance;
+ int64_t next_pts; ///< where the next packet continues the last one
+ /// the timestamp of the first packet, in samples
+ int64_t grid_origin;
+ int grid_step; ///< the length of the last packet
+ /// the packet lengths vary, so no grid places a packet after a seek
+ int grid_varies;
int needs_decoding;
uint64_t max_block_additional_id;
EbmlList block_addition_mappings;
@@ -422,6 +440,7 @@ typedef struct MatroskaDemuxContext {
/* What to skip before effectively reading a packet. */
int skip_to_keyframe;
uint64_t skip_to_timecode;
+ AVRational skip_to_tb; ///< time base of skip_to_timecode
/* File has a CUES element, but we defer parsing until it is needed. */
int cues_parsing_deferred;
@@ -2021,11 +2040,17 @@ static void matroska_add_index_entries(MatroskaDemuxContext *matroska)
for (j = 0; j < pos_list->nb_elem; j++) {
MatroskaTrack *track = matroska_find_track_by_num(matroska,
pos[j].track);
- if (track && track->stream)
+ if (track && track->stream) {
+ int64_t ts = index[i].time / index_scale;
+ // A cue holds a rounded block timestamp, before the codec
+ // delay; the skip after a seek absorbs the rounding.
+ if (track->exact_audio)
+ ts = av_rescale_q(ts, track->tick_tb,
+ track->stream->time_base);
av_add_index_entry(track->stream,
pos[j].pos + matroska->segment_start,
- index[i].time / index_scale, 0, 0,
- AVINDEX_KEYFRAME);
+ ts, 0, 0, AVINDEX_KEYFRAME);
+ }
}
}
}
@@ -3180,6 +3205,100 @@ static int mkv_trust_default_duration(const MatroskaTrack *track,
return 1;
}
+/**
+ * Rebuild the timestamps of an audio track in samples, from the packet
+ * lengths, when the container's clock is coarser than a sample. The
+ * packet length comes from the codec where it is known from the packet or
+ * the stream, or from the track's default duration, which is in
+ * nanoseconds.
+ */
+static void mka_setup_exact_timestamps(MatroskaTrack *track, AVStream *st,
+ MatroskaDemuxContext *matroska)
+{
+ AVCodecParameters *par = st->codecpar;
+ int rate = par->codec_id == AV_CODEC_ID_OPUS ? OPUS_TIMESTAMP_RATE
+ : par->sample_rate;
+ const char *reason;
+ int samples = 0;
+
+ if (track->ms_compat || track->audio.buf) {
+ reason = "packets stored in a compatibility or interleaved mode";
+ goto keep_clock;
+ }
+ // A full parser re-times the packets it splits or merges.
+ if (ffstream(st)->need_parsing == AVSTREAM_PARSE_FULL ||
+ ffstream(st)->need_parsing == AVSTREAM_PARSE_FULL_RAW) {
+ reason = "packets re-timed by a parser";
+ goto keep_clock;
+ }
+ if (rate <= 0) {
+ reason = "sample rate unknown";
+ goto keep_clock;
+ }
+ if (av_cmp_q(st->time_base, (AVRational){ 1, rate }) <= 0) {
+ av_log(matroska->ctx, AV_LOG_DEBUG,
+ "Track %"PRIu64": the clock of the file resolves each sample\n",
+ track->num);
+ return;
+ }
+ switch (par->codec_id) {
+ case AV_CODEC_ID_OPUS:
+ break;
+ // The packets mix block sizes, so no grid places a packet after a seek.
+ case AV_CODEC_ID_VORBIS:
+ reason = "packet lengths vary";
+ goto keep_clock;
+ case AV_CODEC_ID_AAC: {
+ MPEG4AudioConfig cfg = { 0 };
+ int frame_length;
+
+ if (avpriv_mpeg4audio_get_config2(&cfg, par->extradata,
+ par->extradata_size, 1,
+ matroska->ctx) < 0 ||
+ cfg.sample_rate <= 0) {
+ reason = "invalid AudioSpecificConfig";
+ goto keep_clock;
+ }
+ // A frame holds its samples at the core rate, whatever the SBR
+ // signalling.
+ frame_length = cfg.frame_length;
+ if (frame_length <= 0 ||
+ (int64_t)frame_length * rate % cfg.sample_rate) {
+ reason = "frame length unknown";
+ goto keep_clock;
+ }
+ samples = (int64_t)frame_length * rate / cfg.sample_rate;
+ break;
+ }
+ default:
+ if (mkv_trust_default_duration(track, par))
+ samples = av_rescale_rnd(track->default_duration, rate,
+ 1000000000, AV_ROUND_NEAR_INF);
+ if (samples <= 0) {
+ reason = "packet lengths unknown";
+ goto keep_clock;
+ }
+ }
+ track->exact_audio = 1;
+ track->packet_samples = samples;
+ track->tick_tb = st->time_base;
+ track->next_pts = AV_NOPTS_VALUE;
+ track->grid_origin = AV_NOPTS_VALUE;
+ track->ts_tolerance = av_rescale_q_rnd(1, track->tick_tb,
+ (AVRational){ 1, rate },
+ AV_ROUND_UP);
+ track->codec_delay_in_track_tb = av_rescale_q(track->codec_delay,
+ (AVRational){ 1, 1000000000 },
+ (AVRational){ 1, rate });
+ avpriv_set_pts_info(st, 64, 1, rate);
+ return;
+
+keep_clock:
+ av_log(matroska->ctx, AV_LOG_VERBOSE,
+ "Track %"PRIu64" (%s): %s, keeping the clock of the file\n",
+ track->num, avcodec_get_name(par->codec_id), reason);
+}
+
static int matroska_parse_tracks(AVFormatContext *s)
{
MatroskaDemuxContext *matroska = s->priv_data;
@@ -3369,6 +3488,10 @@ static int matroska_parse_tracks(AVFormatContext *s)
memcpy(par->extradata, src, extra_size);
}
+ if (type == MATROSKA_TRACK_TYPE_AUDIO &&
+ matroska->best_fit_ts)
+ mka_setup_exact_timestamps(track, st, matroska);
+
ret = mkv_parse_block_addition_mappings(s, st, track);
if (ret < 0)
return ret;
@@ -4313,6 +4436,9 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf
AVStream *st;
int16_t block_time;
uint32_t lace_size[256];
+ int64_t lace_samples[256];
+ int64_t explicit_duration;
+ int laces_in_samples = 0;
int n, flags, laces = 0;
uint64_t num;
@@ -4351,13 +4477,39 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf
if (cluster_time != (uint64_t) -1 &&
(block_time >= 0 || cluster_time >= -block_time)) {
uint64_t timecode_cluster_in_track_tb = (double) cluster_time / track->time_scale;
- timecode = timecode_cluster_in_track_tb + block_time - track->codec_delay_in_track_tb;
+ timecode = timecode_cluster_in_track_tb + block_time;
+ if (track->exact_audio) {
+ int64_t ts = av_rescale_q(timecode, track->tick_tb, st->time_base);
+ // The clock only places the packets after a gap: the others
+ // continue the one before, or, after a seek, sit on the grid
+ // of packets that starts at the earliest one read.
+ if (track->grid_origin == AV_NOPTS_VALUE || ts < track->grid_origin)
+ track->grid_origin = ts;
+ if (track->next_pts != AV_NOPTS_VALUE &&
+ FFABS(ts - track->next_pts) <= track->ts_tolerance) {
+ ts = track->next_pts;
+ } else if (track->grid_step > 0 && !track->grid_varies) {
+ int64_t on_grid = track->grid_origin +
+ av_rescale_rnd(ts - track->grid_origin, 1,
+ track->grid_step, AV_ROUND_NEAR_INF) *
+ track->grid_step;
+ if (FFABS(on_grid - ts) <= track->ts_tolerance)
+ ts = on_grid;
+ }
+ timecode = ts;
+ }
+ timecode -= track->codec_delay_in_track_tb;
if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE &&
timecode < track->end_timecode)
is_keyframe = 0; /* overlapping subtitles are not key frame */
if (is_keyframe) {
+ // The index of a best-fit track holds block timestamps, as cues
+ // do.
+ int64_t index_ts = timecode;
+ if (track->exact_audio)
+ index_ts += track->codec_delay_in_track_tb;
ff_reduce_index(matroska->ctx, st->index);
- av_add_index_entry(st, cluster_pos, timecode, 0, 0,
+ av_add_index_entry(st, cluster_pos, index_ts, 0, 0,
AVINDEX_KEYFRAME);
}
}
@@ -4367,7 +4519,14 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf
// Compare signed timecodes. Timecode may be negative due to codec delay
// offset. We don't support timestamps greater than int64_t anyway - see
// AVPacket's pts.
- if ((int64_t)timecode < (int64_t)matroska->skip_to_timecode)
+ int64_t block_ts = timecode;
+ // A best-fit index holds block timestamps, and the seek target can
+ // be a rounded cue up to ts_tolerance after the block it names.
+ if (track->exact_audio && timecode != AV_NOPTS_VALUE)
+ block_ts += track->codec_delay_in_track_tb + track->ts_tolerance;
+ if (timecode == AV_NOPTS_VALUE ||
+ av_compare_ts(block_ts, st->time_base,
+ matroska->skip_to_timecode, matroska->skip_to_tb) < 0)
return res;
if (is_keyframe)
matroska->skip_to_keyframe = 0;
@@ -4384,17 +4543,63 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf
return res;
}
+ if (track->exact_audio) {
+ int64_t duration = av_rescale_q(block_duration, track->tick_tb,
+ st->time_base);
+ // av_rescale_q() returns INT64_MIN on overflow.
+ block_duration = duration < 0 ? INT64_MAX : duration;
+ }
+ explicit_duration = block_duration;
+
if (!block_duration && mkv_trust_default_duration(track, st->codecpar))
block_duration = av_rescale_q(track->default_duration * laces,
(AVRational) { 1, 1000000000 },
st->time_base);
+ if (track->exact_audio) {
+ const uint8_t *lace_data = data;
+ int64_t block_samples = 0;
+
+ for (n = 0; n < laces; n++) {
+ int samples = track->packet_samples;
+ if (!samples && st->codecpar->codec_id == AV_CODEC_ID_OPUS &&
+ !track->needs_decoding)
+ samples = ff_opus_packet_samples(lace_data, lace_size[n]);
+ if (samples <= 0) {
+ block_samples = -1;
+ break;
+ }
+ if ((track->grid_step && samples != track->grid_step) ||
+ (n && samples != lace_samples[0]))
+ track->grid_varies = 1;
+ lace_samples[n] = samples;
+ block_samples += samples;
+ lace_data += lace_size[n];
+ }
+ // A BlockDuration other than the packet lengths trims the block.
+ if (block_samples > 0 && explicit_duration &&
+ FFABS(explicit_duration - block_samples) > track->ts_tolerance)
+ block_samples = -1;
+ if (block_samples > 0 && timecode != AV_NOPTS_VALUE) {
+ block_duration = block_samples;
+ track->next_pts = timecode + track->codec_delay_in_track_tb +
+ block_samples;
+ track->grid_step = lace_samples[0];
+ } else {
+ block_samples = 0;
+ track->next_pts = AV_NOPTS_VALUE;
+ }
+ laces_in_samples = block_samples > 0;
+ }
+
if (cluster_time != (uint64_t)-1 && (block_time >= 0 || cluster_time >= -block_time))
track->end_timecode =
FFMAX(track->end_timecode, timecode + block_duration);
for (n = 0; n < laces; n++) {
- int64_t lace_duration = block_duration*(n+1) / laces - block_duration*n / laces;
+ int64_t lace_duration = laces_in_samples ? lace_samples[n] :
+ block_duration*(n+1) / laces -
+ block_duration*n / laces;
uint8_t *out_data = data;
int out_size = lace_size[n];
@@ -4559,6 +4764,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
tracks[i].audio.sub_packet_cnt = 0;
tracks[i].audio.buf_timecode = AV_NOPTS_VALUE;
tracks[i].end_timecode = 0;
+ tracks[i].next_pts = AV_NOPTS_VALUE;
}
/* We seek to a level 1 element, so set the appropriate status. */
@@ -4570,6 +4776,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
sti->skip_to_keyframe = 1;
matroska->skip_to_timecode = sti->index_entries[index].timestamp;
}
+ matroska->skip_to_tb = st->time_base;
matroska->skip_to_keyframe = 1;
matroska->done = 0;
avpriv_update_cur_dts(s, st, sti->index_entries[index].timestamp);
diff --git a/tests/ref/fate/matroska-aac-eld-best-fit-ts b/tests/ref/fate/matroska-aac-eld-best-fit-ts
index 746b936a62..0416deb34d 100644
--- a/tests/ref/fate/matroska-aac-eld-best-fit-ts
+++ b/tests/ref/fate/matroska-aac-eld-best-fit-ts
@@ -1,24 +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
+#tb 0: 1/48000
#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
+0, 0, 0, 512, 208, 0x01cb6153
+0, 512, 512, 512, 216, 0x7b266a4e
+0, 1024, 1024, 512, 210, 0x106e61d9
+0, 1536, 1536, 512, 184, 0xd84b5363
+0, 2048, 2048, 512, 209, 0xd41c6270
+0, 2560, 2560, 512, 189, 0x611159bb
+0, 3072, 3072, 512, 181, 0x74155462
+0, 3584, 3584, 512, 173, 0x9e3152a4
+0, 4096, 4096, 512, 175, 0x6ffc54b7
+0, 4608, 4608, 512, 159, 0xf64e4b48
+0, 5120, 5120, 512, 169, 0xa8274c8c
+0, 5632, 5632, 512, 157, 0x1d9a4ce8
+0, 6144, 6144, 512, 157, 0xfc8549d6
+0, 6656, 6656, 512, 156, 0xe58744bc
+0, 7168, 7168, 512, 160, 0x38e84c54
+0, 7680, 7680, 512, 162, 0xe4744b27
diff --git a/tests/ref/fate/matroska-opus-best-fit-ts b/tests/ref/fate/matroska-opus-best-fit-ts
index e18329417e..944a0d43fe 100644
--- a/tests/ref/fate/matroska-opus-best-fit-ts
+++ b/tests/ref/fate/matroska-opus-best-fit-ts
@@ -1,58 +1,58 @@
#extradata 0: 19, 0x3a04048f
-#tb 0: 1/1000
+#tb 0: 1/48000
#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
+0, -312, -312, 960, 320, 0x58b9a88d, S=1, Skip Samples, 10, 0x02390039
+0, 648, 648, 960, 159, 0x6c9c4b4c
+0, 1608, 1608, 960, 148, 0x0caf4b5d
+0, 2568, 2568, 960, 139, 0xc5624226
+0, 3528, 3528, 960, 146, 0x633c4937
+0, 4488, 4488, 960, 153, 0x3d0b4f93
+0, 5448, 5448, 960, 158, 0xe5c55641
+0, 6408, 6408, 960, 156, 0xf2fd50ef
+0, 7368, 7368, 960, 158, 0x93b15410
+0, 8328, 8328, 960, 157, 0xb6f74f5f
+0, 9288, 9288, 960, 159, 0x9aff4957
+0, 10248, 10248, 960, 153, 0xfc5f4aba
+0, 11208, 11208, 960, 158, 0x01e44f70
+0, 12168, 12168, 960, 153, 0x227149cf
+0, 13128, 13128, 960, 155, 0x312f4cf6
+0, 14088, 14088, 960, 155, 0xafc54bae
+0, 15048, 15048, 960, 151, 0x7b4252b3
+0, 16008, 16008, 960, 155, 0x29074a75
+0, 16968, 16968, 960, 149, 0x82c44bcd
+0, 17928, 17928, 960, 150, 0x55c24eb5
+0, 18888, 18888, 960, 156, 0xf71d4f33
+0, 19848, 19848, 960, 153, 0x9b6c4ae5
+0, 20808, 20808, 960, 156, 0x75954e51
+0, 21768, 21768, 960, 155, 0x28ff4ff3
+0, 22728, 22728, 960, 153, 0xc4424969
+0, 23688, 23688, 960, 154, 0xfbf94cc8
+0, 24648, 24648, 960, 155, 0x52c549af
+0, 25608, 25608, 960, 150, 0x6f1e4b7a
+0, 26568, 26568, 960, 158, 0xabb45566
+0, 27528, 27528, 960, 157, 0xe61d4a99
+0, 28488, 28488, 960, 159, 0xf45d4fac
+0, 29448, 29448, 960, 159, 0xcd0553a5
+0, 30408, 30408, 960, 156, 0xdb244e63
+0, 31368, 31368, 960, 154, 0x78654c52
+0, 32328, 32328, 960, 154, 0x9f804cc8
+0, 33288, 33288, 960, 150, 0x1fdf4c80
+0, 34248, 34248, 960, 155, 0x1adc4f89
+0, 35208, 35208, 960, 155, 0x4b53511c
+0, 36168, 36168, 960, 151, 0x8ff2546d
+0, 37128, 37128, 960, 158, 0xb7e34f1b
+0, 38088, 38088, 960, 154, 0x4d98474b
+0, 39048, 39048, 960, 154, 0x14924ea8
+0, 40008, 40008, 960, 153, 0x8d4752bf
+0, 40968, 40968, 960, 149, 0x74785066
+0, 41928, 41928, 960, 151, 0x36c94a4c
+0, 42888, 42888, 960, 155, 0x82904f3b
+0, 43848, 43848, 960, 154, 0xd76b4a45
+0, 44808, 44808, 960, 159, 0x9fec548d
+0, 45768, 45768, 960, 154, 0x9a084dcd
+0, 46728, 46728, 960, 155, 0x90a54ac8
+0, 47688, 47688, 960, 324, 0x8e34a2f5
+0, 48648, 48648, 960, 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
index 0793ae7e4a..31a796945a 100644
--- a/tests/ref/fate/matroska-opus-best-fit-ts-gap
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-gap
@@ -1,60 +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
+#tb 0: 1/48000
#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
+0, -312, -312, 960, 320, 0x58b9a88d, S=1, Skip Samples, 10, 0x02390039
+0, 792, 792, 960, 159, 0x6c9c4b4c
+0, 1752, 1752, 960, 148, 0x0caf4b5d
+0, 2712, 2712, 960, 139, 0xc5624226
+0, 3672, 3672, 960, 146, 0x633c4937
+0, 4632, 4632, 960, 153, 0x3d0b4f93
+0, 5592, 5592, 960, 158, 0xe5c55641
+0, 6552, 6552, 960, 156, 0xf2fd50ef
+0, 7512, 7512, 960, 158, 0x93b15410
+0, 8472, 8472, 960, 157, 0xb6f74f5f
+0, 9432, 9432, 960, 159, 0x9aff4957
+0, 10392, 10392, 960, 153, 0xfc5f4aba
+0, 11352, 11352, 960, 158, 0x01e44f70
+0, 12312, 12312, 960, 153, 0x227149cf
+0, 13272, 13272, 960, 155, 0x312f4cf6
+0, 14232, 14232, 960, 155, 0xafc54bae
+0, 15192, 15192, 960, 151, 0x7b4252b3
+0, 16152, 16152, 960, 155, 0x29074a75
+0, 17112, 17112, 960, 149, 0x82c44bcd
+0, 18072, 18072, 960, 150, 0x55c24eb5
+0, 19032, 19032, 960, 156, 0xf71d4f33
+0, 19992, 19992, 960, 153, 0x9b6c4ae5
+0, 20952, 20952, 960, 156, 0x75954e51
+0, 21912, 21912, 960, 155, 0x28ff4ff3
+0, 22872, 22872, 960, 153, 0xc4424969
+0, 23832, 23832, 960, 154, 0xfbf94cc8
+0, 24792, 24792, 960, 155, 0x52c549af
+0, 25752, 25752, 960, 150, 0x6f1e4b7a
+0, 26712, 26712, 960, 158, 0xabb45566
+0, 27672, 27672, 960, 157, 0xe61d4a99
+0, 28632, 28632, 960, 159, 0xf45d4fac
+0, 29592, 29592, 960, 159, 0xcd0553a5
+0, 30552, 30552, 960, 156, 0xdb244e63
+0, 31512, 31512, 960, 154, 0x78654c52
+0, 32472, 32472, 960, 154, 0x9f804cc8
+0, 33432, 33432, 960, 150, 0x1fdf4c80
+0, 34392, 34392, 960, 155, 0x1adc4f89
+0, 35352, 35352, 960, 155, 0x4b53511c
+0, 36312, 36312, 960, 151, 0x8ff2546d
+0, 37272, 37272, 960, 158, 0xb7e34f1b
+0, 38232, 38232, 960, 154, 0x4d98474b
+0, 39192, 39192, 960, 154, 0x14924ea8
+0, 40152, 40152, 960, 153, 0x8d4752bf
+0, 41112, 41112, 960, 149, 0x74785066
+0, 42072, 42072, 960, 151, 0x36c94a4c
+0, 43032, 43032, 960, 155, 0x82904f3b
+0, 43992, 43992, 960, 154, 0xd76b4a45
+0, 44952, 44952, 960, 159, 0x9fec548d
+0, 45912, 45912, 960, 154, 0x9a084dcd
+0, 46872, 46872, 960, 155, 0x90a54ac8
+0, 47832, 47832, 960, 324, 0x8e34a2f5
+0, 48792, 48792, 960, 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
index a4bab2ceb7..059e7f5662 100644
--- a/tests/ref/fate/matroska-opus-best-fit-ts-sample-gap
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-sample-gap
@@ -1,60 +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
+#tb 0: 1/48000
#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
+0, -312, -312, 960, 320, 0x58b9a88d, S=1, Skip Samples, 10, 0x02390039
+0, 648, 648, 960, 159, 0x6c9c4b4c
+0, 1608, 1608, 960, 148, 0x0caf4b5d
+0, 2568, 2568, 960, 139, 0xc5624226
+0, 3528, 3528, 960, 146, 0x633c4937
+0, 4488, 4488, 960, 153, 0x3d0b4f93
+0, 5448, 5448, 960, 158, 0xe5c55641
+0, 6408, 6408, 960, 156, 0xf2fd50ef
+0, 7368, 7368, 960, 158, 0x93b15410
+0, 8328, 8328, 960, 157, 0xb6f74f5f
+0, 9288, 9288, 960, 159, 0x9aff4957
+0, 10248, 10248, 960, 153, 0xfc5f4aba
+0, 11208, 11208, 960, 158, 0x01e44f70
+0, 12168, 12168, 960, 153, 0x227149cf
+0, 13128, 13128, 960, 155, 0x312f4cf6
+0, 14088, 14088, 960, 155, 0xafc54bae
+0, 15048, 15048, 960, 151, 0x7b4252b3
+0, 16008, 16008, 960, 155, 0x29074a75
+0, 16968, 16968, 960, 149, 0x82c44bcd
+0, 17928, 17928, 960, 150, 0x55c24eb5
+0, 18888, 18888, 960, 156, 0xf71d4f33
+0, 19848, 19848, 960, 153, 0x9b6c4ae5
+0, 20808, 20808, 960, 156, 0x75954e51
+0, 21768, 21768, 960, 155, 0x28ff4ff3
+0, 22728, 22728, 960, 153, 0xc4424969
+0, 23688, 23688, 960, 154, 0xfbf94cc8
+0, 24648, 24648, 960, 155, 0x52c549af
+0, 25608, 25608, 960, 150, 0x6f1e4b7a
+0, 26568, 26568, 960, 158, 0xabb45566
+0, 27528, 27528, 960, 157, 0xe61d4a99
+0, 28488, 28488, 960, 159, 0xf45d4fac
+0, 29448, 29448, 960, 159, 0xcd0553a5
+0, 30408, 30408, 960, 156, 0xdb244e63
+0, 31368, 31368, 960, 154, 0x78654c52
+0, 32328, 32328, 960, 154, 0x9f804cc8
+0, 33288, 33288, 960, 150, 0x1fdf4c80
+0, 34248, 34248, 960, 155, 0x1adc4f89
+0, 35208, 35208, 960, 155, 0x4b53511c
+0, 36168, 36168, 960, 151, 0x8ff2546d
+0, 37128, 37128, 960, 158, 0xb7e34f1b
+0, 38088, 38088, 960, 154, 0x4d98474b
+0, 39048, 39048, 960, 154, 0x14924ea8
+0, 40008, 40008, 960, 153, 0x8d4752bf
+0, 40968, 40968, 960, 149, 0x74785066
+0, 41928, 41928, 960, 151, 0x36c94a4c
+0, 42888, 42888, 960, 155, 0x82904f3b
+0, 43848, 43848, 960, 154, 0xd76b4a45
+0, 44808, 44808, 960, 159, 0x9fec548d
+0, 45768, 45768, 960, 154, 0x9a084dcd
+0, 46728, 46728, 960, 155, 0x90a54ac8
+0, 47688, 47688, 960, 324, 0x8e34a2f5
+0, 48648, 48648, 960, 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
index d3c07085e8..e69590cb4c 100644
--- a/tests/ref/fate/matroska-opus-best-fit-ts-seek
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-seek
@@ -1,2 +1,2 @@
-packet|pts=6770|pos=8480
-packet|pts=47345|pos=21765
+packet|pts=-312|pos=5426
+packet|pts=43848|pos=20239
diff --git a/tests/ref/seek/mkv-best-fit-ts b/tests/ref/seek/mkv-best-fit-ts
index f281eceb75..9ce27d5df2 100644
--- a/tests/ref/seek/mkv-best-fit-ts
+++ b/tests/ref/seek/mkv-best-fit-ts
@@ -1,107 +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:1 dts: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 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 dts: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 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: 1 flags:1 dts: 1.992000 pts: 1.992000 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 dts: 2.013333 pts: 2.013333 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: 1 flags:1 dts: 1.992000 pts: 1.992000 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 dts: 2.013333 pts: 2.013333 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: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 pos: 1783 size: 500
+ret: 0 st: 1 flags:0 ts: 2.576667
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:1 dts: 2.717333 pts: 2.717333 pos:1369672 size: 480
+ret: 0 st: 1 flags:1 dts: 2.738667 pts: 2.738667 pos:1369672 size: 492
+ret: 0 st: 1 flags:1 ts: 1.470833
+ret: 0 st: 1 flags:1 dts: 0.989333 pts: 0.989333 pos: 450438 size: 487
+ret: 0 st: 1 flags:1 dts: 1.010667 pts: 1.010667 pos: 450438 size: 485
+ret: 0 st: 1 flags:1 dts: 1.992000 pts: 1.992000 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: 1 flags:1 dts: 1.992000 pts: 1.992000 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 dts: 2.013333 pts: 2.013333 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: 1 flags:1 dts: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 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: 1 flags:1 dts: 3.037333 pts: 3.037333 pos:1594220 size: 483
+ret: 0 st: 1 flags:1 dts: 3.058667 pts: 3.058667 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: 1 flags:1 dts: 1.992000 pts: 1.992000 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: 2.013333 pts: 2.013333 pos:1049679 size: 481
+ret: 0 st: 1 flags:0 ts:-0.058333
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: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 pos: 1783 size: 500
+ret: 0 st: 1 flags:1 ts: 2.835833
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 dts: 2.717333 pts: 2.717333 pos:1369672 size: 480
+ret: 0 st: 1 flags:1 dts: 2.738667 pts: 2.738667 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 dts: 2.013333 pts: 2.013333 pos:1049679 size: 481
+ret: 0 st: 1 flags:1 dts: 2.034667 pts: 2.034667 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: 1 flags:1 dts: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 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: 1 flags:1 dts: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 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: 1 flags:1 dts: 2.013333 pts: 2.013333 pos:1049679 size: 481
+ret: 0 st: 1 flags:1 dts: 2.034667 pts: 2.034667 pos:1049679 size: 473
+ret: 0 st: 1 flags:0 ts: 1.306667
+ret: 0 st: 1 flags:1 dts: 1.992000 pts: 1.992000 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: 2.013333 pts: 2.013333 pos:1049679 size: 481
+ret: 0 st: 1 flags:1 ts: 0.200833
+ret: 0 st: 1 flags:1 dts: 0.178667 pts: 0.178667 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:1 dts: 0.221333 pts: 0.221333 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 dts: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 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: 1 flags:1 dts: 1.992000 pts: 1.992000 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 dts: 2.013333 pts: 2.013333 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: 1 flags:1 dts: 1.992000 pts: 1.992000 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 dts: 2.013333 pts: 2.013333 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: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 pos: 1783 size: 500
+ret: 0 st: 1 flags:0 ts: 2.671667
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:1 dts: 2.717333 pts: 2.717333 pos:1369672 size: 480
+ret: 0 st: 1 flags:1 dts: 2.738667 pts: 2.738667 pos:1369672 size: 492
+ret: 0 st: 1 flags:1 ts: 1.565833
+ret: 0 st: 1 flags:1 dts: 0.989333 pts: 0.989333 pos: 450438 size: 487
+ret: 0 st: 1 flags:1 dts: 1.010667 pts: 1.010667 pos: 450438 size: 485
+ret: 0 st: 1 flags:1 dts: 1.992000 pts: 1.992000 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: 1 flags:1 dts: 1.992000 pts: 1.992000 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 dts: 2.013333 pts: 2.013333 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
+ret: 0 st: 1 flags:1 dts: 0.029333 pts: 0.029333 pos: 1783 size: 510
+ret: 0 st: 1 flags:1 dts: 0.050667 pts: 0.050667 pos: 1783 size: 500