Commit 9ced9e345c for ffmpeg

commit 9ced9e345c0408e190ebb18387fb7fbc2db69422
Author: Romain Beauxis <romain.beauxis@gmail.com>
Date:   Wed Nov 18 08:58:13 2026 -0600

    avformat/matroskaenc: pick a clock finer than a sample

    Use the coarsest power-of-ten TimestampScale, up to 1 ms, finer than
    half a sample of every audio stream, and no finer than 10 us with video
    so frame reordering fits in a Block offset. WebM keeps 1 ms. The
    timestamp_scale option overrides it; 1000000 restores the old output.

    The cluster time limit is capped to 32767 ticks, with a warning when
    the user's value is capped.

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 16a772818f..4b419718ab 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -3031,7 +3031,21 @@ hardcoded fixed value.
 Store at most the provided number of milliseconds in a cluster.

 If not specified, the limit is set automatically to a sensible
-hardcoded fixed value.
+hardcoded fixed value. The limit cannot exceed 32767 ticks of the
+timestamp scale, 327 milliseconds at 10 microseconds.
+
+@item timestamp_scale @var{nanoseconds}
+Set the clock of the file, in nanoseconds.
+
+If set to @code{0}, the default, the muxer picks the coarsest power of
+ten of a nanosecond, up to a millisecond, that is finer than half a
+sample of every audio stream: 10 microseconds at 44.1 or 48 kHz. With a
+video stream the clock stays at 10 microseconds or above, so that frame
+reordering fits in a cluster. WebM files use a millisecond.
+A value set by this option applies to WebM files too.
+
+Set it to @code{1000000} to write the millisecond clock that most
+Matroska files use.

 @item dash @var{bool}
 Create a WebM file conforming to WebM DASH specification. By default
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d9a40f8822..e2387864eb 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -253,6 +253,8 @@ typedef struct MatroskaMuxContext {
     int                 reserve_cues_space;
     int                 cluster_size_limit;
     int64_t             cluster_time_limit;
+    /// the clock of the file, in nanoseconds, 0 to pick it
+    int64_t             timestamp_scale;
     int                 write_crc;
     int                 is_live;

@@ -1902,13 +1904,16 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv,
 }

 static void mkv_write_default_duration(mkv_track *track, AVIOContext *pb,
-                                       AVRational duration)
+                                       AVRational duration,
+                                       int64_t timestamp_scale)
 {
+    int64_t den = duration.den * timestamp_scale;
+
     put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION,
                   1000000000LL * duration.num / duration.den);
-    track->default_duration_low  = 1000LL * duration.num / duration.den;
+    track->default_duration_low  = 1000000000LL * duration.num / den;
     track->default_duration_high = track->default_duration_low +
-                                    !!(1000LL * duration.num % duration.den);
+                                    !!(1000000000LL * duration.num % den);
 }

 static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
@@ -2033,7 +2038,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
             frame_rate = st->r_frame_rate;

         if (frame_rate.num > 0)
-            mkv_write_default_duration(track, pb, av_inv_q(frame_rate));
+            mkv_write_default_duration(track, pb, av_inv_q(frame_rate),
+                                       mkv->timestamp_scale);

         if (CONFIG_MATROSKA_MUXER && !native_id &&
             ff_codec_get_tag(ff_codec_movvideo_tags, par->codec_id) &&
@@ -2091,8 +2097,10 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
         if (!audio_frame_samples)
             audio_frame_samples = par->frame_size;
         if (audio_frame_samples)
-            mkv_write_default_duration(track, pb, (AVRational){ audio_frame_samples,
-                                                                par->sample_rate });
+            mkv_write_default_duration(track, pb,
+                                       (AVRational){ audio_frame_samples,
+                                                     par->sample_rate },
+                                       mkv->timestamp_scale);
         if (!native_id)
             // no mkv-specific ID, use ACM mode
             put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
@@ -2582,7 +2590,7 @@ static int mkv_write_info(AVFormatContext *s)
         return ret;
     pb = mkv->info.bc;

-    put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000);
+    put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, mkv->timestamp_scale);
     if ((tag = av_dict_get(s->metadata, "title", NULL, 0)))
         put_ebml_string(pb, MATROSKA_ID_TITLE, tag->value);
     if (!(s->flags & AVFMT_FLAG_BITEXACT)) {
@@ -2615,11 +2623,15 @@ static int mkv_write_info(AVFormatContext *s)
         int64_t metadata_duration = get_metadata_duration(s);

         if (s->duration > 0) {
-            int64_t scaledDuration = av_rescale(s->duration, 1000, AV_TIME_BASE);
+            int64_t scaledDuration =
+                av_rescale(s->duration, 1000000000LL,
+                           AV_TIME_BASE * mkv->timestamp_scale);
             put_ebml_float(pb, MATROSKA_ID_DURATION, scaledDuration);
             av_log(s, AV_LOG_DEBUG, "Write early duration from recording time = %" PRIu64 "\n", scaledDuration);
         } else if (metadata_duration > 0) {
-            int64_t scaledDuration = av_rescale(metadata_duration, 1000, AV_TIME_BASE);
+            int64_t scaledDuration =
+                av_rescale(metadata_duration, 1000000000LL,
+                           AV_TIME_BASE * mkv->timestamp_scale);
             put_ebml_float(pb, MATROSKA_ID_DURATION, scaledDuration);
             av_log(s, AV_LOG_DEBUG, "Write early duration from metadata = %" PRIu64 "\n", scaledDuration);
         } else if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) {
@@ -2635,6 +2647,7 @@ static int mkv_write_header(AVFormatContext *s)
     MatroskaMuxContext *mkv = s->priv_data;
     AVIOContext *pb = s->pb;
     int ret, version = 2;
+    int cluster_time_limit_set;

     ret = avio_open_dyn_buf(&mkv->tmp_bc);
     if (ret < 0)
@@ -2711,6 +2724,7 @@ static int mkv_write_header(AVFormatContext *s)

     mkv->cluster_pos = -1;

+    cluster_time_limit_set = mkv->cluster_time_limit >= 0;
     // start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
     // after 4k and on a keyframe
     if (IS_SEEKABLE(pb, mkv)) {
@@ -2724,6 +2738,17 @@ static int mkv_write_header(AVFormatContext *s)
         if (mkv->cluster_size_limit < 0)
             mkv->cluster_size_limit = 32 * 1024;
     }
+    // From milliseconds to the clock of the file, within the reach of the
+    // 16-bit offset of a Block.
+    mkv->cluster_time_limit = av_rescale(mkv->cluster_time_limit, 1000000,
+                                         mkv->timestamp_scale);
+    if (mkv->cluster_time_limit > INT16_MAX) {
+        mkv->cluster_time_limit = INT16_MAX;
+        if (cluster_time_limit_set)
+            av_log(s, AV_LOG_WARNING, "cluster_time_limit capped to %"PRId64
+                   " ms by the timestamp scale\n",
+                   INT16_MAX * mkv->timestamp_scale / 1000000);
+    }

     return 0;
 }
@@ -3126,7 +3151,9 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
                    "timestamp %"PRId64" ms, current cluster timestamp %"PRId64
                    " ms, delta %"PRId64" ms outside the signed 16-bit range\n",
                    cluster_time < 0 ? "backward" : "forward", pkt->stream_index,
-                   ts, mkv->cluster_pts, cluster_time);
+                   av_rescale(ts, mkv->timestamp_scale, 1000000),
+                   av_rescale(mkv->cluster_pts, mkv->timestamp_scale, 1000000),
+                   av_rescale(cluster_time, mkv->timestamp_scale, 1000000));
         }
     }

@@ -3487,6 +3514,40 @@ static uint64_t mkv_get_uid(const mkv_track *tracks, int i, AVLFG *c)
     }
 }

+/**
+ * The clock of the file: the coarsest power of ten of a nanosecond, up to
+ * the de-facto standard millisecond, that is finer than half a sample of
+ * every audio stream, Opus counting at 48 kHz whatever its signalled rate.
+ * A Block holds a signed 16-bit offset from its Cluster, so a finer clock
+ * means shorter clusters, and with video the clock stays at 10 us or above
+ * to leave room for frame reordering. WebM keeps milliseconds, as its
+ * guidelines require.
+ */
+static int64_t mkv_timestamp_scale(AVFormatContext *s,
+                                   const MatroskaMuxContext *mkv)
+{
+    int64_t scale = 1000000, min_scale = 1, max_rate = 0;
+
+    if (mkv->timestamp_scale)
+        return mkv->timestamp_scale;
+    if (IS_WEBM(mkv))
+        return scale;
+    for (unsigned i = 0; i < s->nb_streams; i++) {
+        const AVCodecParameters *par = s->streams[i]->codecpar;
+
+        if (par->codec_type == AVMEDIA_TYPE_VIDEO)
+            min_scale = 10000;
+        if (par->codec_type != AVMEDIA_TYPE_AUDIO)
+            continue;
+        max_rate = FFMAX(max_rate, par->sample_rate);
+        if (par->codec_id == AV_CODEC_ID_OPUS)
+            max_rate = FFMAX(max_rate, OPUS_TIMESTAMP_RATE);
+    }
+    while (scale > min_scale && scale * max_rate > 500000000LL)
+        scale /= 10;
+    return scale;
+}
+
 static int mkv_init(struct AVFormatContext *s)
 {
     FFFormatContext *const si = ffformatcontext(s);
@@ -3523,6 +3584,7 @@ static int mkv_init(struct AVFormatContext *s)
         mkv->write_crc = 0;
     } else
         mkv->mode = MODE_MATROSKAv2;
+    mkv->timestamp_scale = mkv_timestamp_scale(s, mkv);

     mkv->cur_audio_pkt = ffformatcontext(s)->pkt;

@@ -3577,8 +3639,7 @@ static int mkv_init(struct AVFormatContext *s)
             track->uid = mkv_get_uid(mkv->tracks, i, &c);
         }

-        // ms precision is the de-facto standard timescale for mkv files
-        avpriv_set_pts_info(st, 64, 1, 1000);
+        avpriv_set_pts_info(st, 64, mkv->timestamp_scale, 1000000000);

         if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
             if (IS_WEBM(mkv)) {
@@ -3652,6 +3713,7 @@ static const AVOption options[] = {
     { "cues_to_front", "move Cues (the index) to the front by shifting data if necessary", OFFSET(move_cues_to_front), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, FLAGS },
     { "cluster_size_limit",  "store at most the provided amount of bytes in a cluster",                                     OFFSET(cluster_size_limit), AV_OPT_TYPE_INT  , { .i64 = -1 }, -1, INT_MAX,   FLAGS },
     { "cluster_time_limit",  "store at most the provided number of milliseconds in a cluster",                               OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS },
+    { "timestamp_scale", "clock of the file in nanoseconds, 0 to pick one finer than a sample", OFFSET(timestamp_scale), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, 1000000000, FLAGS },
     { "dash", "create a WebM file conforming to WebM DASH specification", OFFSET(is_dash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
     { "dash_track_number", "track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, FLAGS },
     { "live", "write files assuming it is a live stream", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 2e8f4f2374..5d4870f3ed 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -24,13 +24,13 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, OPUS_PARSER OPUS_DECODER) +
 fate-matroska-opus-best-fit-ts-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/codec_delay_opus.mkv matroska "-c copy" "-c copy" "" "" "" "-best_fit_ts 1"

 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" "" "" "-best_fit_ts 1" "-best_fit_ts 1"
+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 -timestamp_scale 1000000" "-c copy" "" "" "-best_fit_ts 1" "-best_fit_ts 1"

 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" "" "" "-best_fit_ts 1" "-best_fit_ts 1"

 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" "" "" "-best_fit_ts 1"
+fate-matroska-aac-eld-best-fit-ts: CMD = transcode mov $(TARGET_SAMPLES)/aac/er_eld2000np_48_ep0.mp4 matroska "-c copy -frames:a 16 -timestamp_scale 1000000" "-c copy" "" "" "-best_fit_ts 1"

 FATE_MATROSKA-$(call FRAMECRC, MATROSKA,, VORBIS_PARSER) += fate-matroska-vorbis-best-fit-ts
 fate-matroska-vorbis-best-fit-ts: CMD = framecrc -best_fit_ts 1 -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -map 0:a -c copy -frames:a 50
diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak
index 314b6f649b..15d2bb490b 100644
--- a/tests/fate/wavpack.mak
+++ b/tests/fate/wavpack.mak
@@ -102,12 +102,12 @@ fate-wavpack-matroskamode: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/ma
 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-mono
 fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska
 fate-wavpack-matroska_mux-mono: CMP = oneline
-fate-wavpack-matroska_mux-mono: REF = 5863eb94f7583aa9c5fded17474f2e7c
+fate-wavpack-matroska_mux-mono: REF = 17ecbc5ffe043bba3140c6dc62bf7eba

 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-61
 fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska
 fate-wavpack-matroska_mux-61: CMP = oneline
-fate-wavpack-matroska_mux-61: REF = 2bbb393d060fa841f1172028f2c69b3a
+fate-wavpack-matroska_mux-61: REF = f95d35fdcdfb5b8615618f21fdc2e4e4

 FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S8,    PCM_S8,    MD5_PROTOCOL) += $(FATE_WAVPACK_S8)
 FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S16LE, PCM_S16LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S16)
diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc
index 1d7fe46536..6807b3d7df 100644
--- a/tests/ref/fate/aac-autobsf-adtstoasc
+++ b/tests/ref/fate/aac-autobsf-adtstoasc
@@ -1,42 +1,42 @@
-e76eb6a17a975e0f12b6868082bfaf0d *tests/data/fate/aac-autobsf-adtstoasc.matroska
-6653 tests/data/fate/aac-autobsf-adtstoasc.matroska
+ab9b67be7e7fc48ecde395f157f9b4d5 *tests/data/fate/aac-autobsf-adtstoasc.matroska
+6865 tests/data/fate/aac-autobsf-adtstoasc.matroska
 #extradata 0:        2, 0x0030001c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
 #channel_layout_name 0: mono
-0,          0,          0,       64,        4, 0x02f70117
-0,         64,         64,       64,      163, 0xd5f85007
-0,        128,        128,       64,      127, 0x66484065
-0,        192,        192,       64,       94, 0x55222bd6
-0,        256,        256,       64,      314, 0x3c7e923a
-0,        320,        320,       64,      207, 0x1efc5d1b
-0,        384,        384,       64,      119, 0xb2a13601
-0,        448,        448,       64,      184, 0xcafc6091
-0,        512,        512,       64,      132, 0xddd33c0b
-0,        576,        576,       64,      152, 0x83935031
-0,        640,        640,       64,      227, 0x32a86bc4
-0,        704,        704,       64,      122, 0xd04e3571
-0,        768,        768,       64,      163, 0x57d44d16
-0,        832,        832,       64,      147, 0x226043d7
-0,        896,        896,       64,      119, 0x8ad931ed
-0,        960,        960,       64,      153, 0xbb6e432f
-0,       1024,       1024,       64,      185, 0xa01f4ff3
-0,       1088,       1088,       64,      126, 0x85503ce6
-0,       1152,       1152,       64,      246, 0x652c7b59
-0,       1216,       1216,       64,      162, 0xc9f04da0
-0,       1280,       1280,       64,      135, 0x71fa3be0
-0,       1344,       1344,       64,      246, 0x7a6f7788
-0,       1408,       1408,       64,      262, 0xd3097781
-0,       1472,       1472,       64,       60, 0x09a118f5
-0,       1536,       1536,       64,      255, 0xbab5793c
-0,       1600,       1600,       64,      153, 0x6b6a44fb
-0,       1664,       1664,       64,      160, 0x550e4530
-0,       1728,       1728,       64,      215, 0x7fe66144
-0,       1792,       1792,       64,      144, 0xcd723f7d
-0,       1856,       1856,       64,      187, 0x2a0b5c1b
-0,       1920,       1920,       64,      177, 0xb8c355d5
-0,       1984,       1984,       64,      156, 0x867d4f3a
-0,       2048,       2048,       64,      201, 0x62745ff9
-0,       2112,       2112,       64,      137, 0x90c639e0
+0,          0,          0,     6400,        4, 0x02f70117
+0,       6400,       6400,     6400,      163, 0xd5f85007
+0,      12800,      12800,     6400,      127, 0x66484065
+0,      19200,      19200,     6400,       94, 0x55222bd6
+0,      25600,      25600,     6400,      314, 0x3c7e923a
+0,      32000,      32000,     6400,      207, 0x1efc5d1b
+0,      38400,      38400,     6400,      119, 0xb2a13601
+0,      44800,      44800,     6400,      184, 0xcafc6091
+0,      51200,      51200,     6400,      132, 0xddd33c0b
+0,      57600,      57600,     6400,      152, 0x83935031
+0,      64000,      64000,     6400,      227, 0x32a86bc4
+0,      70400,      70400,     6400,      122, 0xd04e3571
+0,      76800,      76800,     6400,      163, 0x57d44d16
+0,      83200,      83200,     6400,      147, 0x226043d7
+0,      89600,      89600,     6400,      119, 0x8ad931ed
+0,      96000,      96000,     6400,      153, 0xbb6e432f
+0,     102400,     102400,     6400,      185, 0xa01f4ff3
+0,     108800,     108800,     6400,      126, 0x85503ce6
+0,     115200,     115200,     6400,      246, 0x652c7b59
+0,     121600,     121600,     6400,      162, 0xc9f04da0
+0,     128000,     128000,     6400,      135, 0x71fa3be0
+0,     134400,     134400,     6400,      246, 0x7a6f7788
+0,     140800,     140800,     6400,      262, 0xd3097781
+0,     147200,     147200,     6400,       60, 0x09a118f5
+0,     153600,     153600,     6400,      255, 0xbab5793c
+0,     160000,     160000,     6400,      153, 0x6b6a44fb
+0,     166400,     166400,     6400,      160, 0x550e4530
+0,     172800,     172800,     6400,      215, 0x7fe66144
+0,     179200,     179200,     6400,      144, 0xcd723f7d
+0,     185600,     185600,     6400,      187, 0x2a0b5c1b
+0,     192000,     192000,     6400,      177, 0xb8c355d5
+0,     198400,     198400,     6400,      156, 0x867d4f3a
+0,     204800,     204800,     6400,      201, 0x62745ff9
+0,     211200,     211200,     6400,      137, 0x90c639e0
diff --git a/tests/ref/fate/atrac-matroska-remux b/tests/ref/fate/atrac-matroska-remux
index 1f627959d7..18772a19f0 100644
--- a/tests/ref/fate/atrac-matroska-remux
+++ b/tests/ref/fate/atrac-matroska-remux
@@ -1,94 +1,94 @@
-1e0eab5c5cb6ee0a77ff9c4611a3044b *tests/data/fate/atrac-matroska-remux.matroska
-450932 tests/data/fate/atrac-matroska-remux.matroska
-#tb 0: 1/1000
+891b0de8de3fda46d45804626dbfc7f6 *tests/data/fate/atrac-matroska-remux.matroska
+452219 tests/data/fate/atrac-matroska-remux.matroska
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: atrac1
 #sample_rate 0: 44100
 #channel_layout_name 0: stereo
-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
+0,          0,          0,     1161,      424, 0x3b6509a4
+0,       1161,       1161,     1161,      424, 0x3b6509a4
+0,       2322,       2322,     1161,      424, 0x3b6509a4
+0,       3483,       3483,     1161,      424, 0x3b6509a4
+0,       4644,       4644,     1161,      424, 0x3b6509a4
+0,       5805,       5805,     1161,      424, 0x3b6509a4
+0,       6966,       6966,     1161,      424, 0x3b6509a4
+0,       8127,       8127,     1161,      424, 0x3b6509a4
+0,       9288,       9288,     1161,      424, 0x3b6509a4
+0,      10449,      10449,     1161,      424, 0x3b6509a4
+0,      11610,      11610,     1161,      424, 0x3b6509a4
+0,      12771,      12771,     1161,      424, 0x3b6509a4
+0,      13932,      13932,     1161,      424, 0x3b6509a4
+0,      15093,      15093,     1161,      424, 0x3b6509a4
+0,      16254,      16254,     1161,      424, 0x3b6509a4
+0,      17415,      17415,     1161,      424, 0x3b6509a4
+0,      18576,      18576,     1161,      424, 0x3b6509a4
+0,      19737,      19737,     1161,      424, 0x3b6509a4
+0,      20898,      20898,     1161,      424, 0x3b6509a4
+0,      22059,      22059,     1161,      424, 0x3b6509a4
+0,      23220,      23220,     1161,      424, 0x3b6509a4
+0,      24381,      24381,     1161,      424, 0x3b6509a4
+0,      25542,      25542,     1161,      424, 0x3b6509a4
+0,      26703,      26703,     1161,      424, 0x3b6509a4
+0,      27864,      27864,     1161,      424, 0x3b6509a4
+0,      29025,      29025,     1161,      424, 0x3b6509a4
+0,      30186,      30186,     1161,      424, 0x3b6509a4
+0,      31347,      31347,     1161,      424, 0x3b6509a4
+0,      32508,      32508,     1161,      424, 0x3b6509a4
+0,      33669,      33669,     1161,      424, 0x3b6509a4
+0,      34830,      34830,     1161,      424, 0x3b6509a4
+0,      35991,      35991,     1161,      424, 0x3b6509a4
+0,      37152,      37152,     1161,      424, 0x3b6509a4
+0,      38313,      38313,     1161,      424, 0x3b6509a4
+0,      39474,      39474,     1161,      424, 0x3b6509a4
+0,      40635,      40635,     1161,      424, 0x3b6509a4
+0,      41796,      41796,     1161,      424, 0x3b6509a4
+0,      42957,      42957,     1161,      424, 0x3b6509a4
+0,      44118,      44118,     1161,      424, 0x3b6509a4
+0,      45279,      45279,     1161,      424, 0x3b6509a4
+0,      46440,      46440,     1161,      424, 0x3b6509a4
+0,      47601,      47601,     1161,      424, 0x3b6509a4
+0,      48762,      48762,     1161,      424, 0x3b6509a4
+0,      49923,      49923,     1161,      424, 0x3b6509a4
+0,      51084,      51084,     1161,      424, 0x3b6509a4
+0,      52245,      52245,     1161,      424, 0x3b6509a4
+0,      53406,      53406,     1161,      424, 0x3b6509a4
+0,      54567,      54567,     1161,      424, 0x3b6509a4
+0,      55728,      55728,     1161,      424, 0x3b6509a4
+0,      56889,      56889,     1161,      424, 0x3b6509a4
+0,      58050,      58050,     1161,      424, 0x3b6509a4
+0,      59211,      59211,     1161,      424, 0x3b6509a4
+0,      60372,      60372,     1161,      424, 0x3b6509a4
+0,      61533,      61533,     1161,      424, 0x3b6509a4
+0,      62694,      62694,     1161,      424, 0x3b6509a4
+0,      63855,      63855,     1161,      424, 0x3b6509a4
+0,      65016,      65016,     1161,      424, 0x3b6509a4
+0,      66177,      66177,     1161,      424, 0x3b6509a4
+0,      67338,      67338,     1161,      424, 0x3b6509a4
+0,      68499,      68499,     1161,      424, 0x3b6509a4
+0,      69660,      69660,     1161,      424, 0x3b6509a4
+0,      70821,      70821,     1161,      424, 0x9699a148
+0,      71982,      71982,     1161,      424, 0x4b15b57e
+0,      73143,      73143,     1161,      424, 0x690fbe86
+0,      74304,      74304,     1161,      424, 0x8980bea4
+0,      75465,      75465,     1161,      424, 0xc792c244
+0,      76626,      76626,     1161,      424, 0x57e1bac4
+0,      77787,      77787,     1161,      424, 0xe813bebe
+0,      78948,      78948,     1161,      424, 0x022cbf4e
+0,      80109,      80109,     1161,      424, 0x36e1bdce
+0,      81270,      81270,     1161,      424, 0x243dbdf4
+0,      82431,      82431,     1161,      424, 0x8eeebba8
+0,      83592,      83592,     1161,      424, 0x8088bbac
+0,      84753,      84753,     1161,      424, 0xf75fbc8c
+0,      85914,      85914,     1161,      424, 0x9678c284
+0,      87075,      87075,     1161,      424, 0x45edbc50
+0,      88236,      88236,     1161,      424, 0xe9ffbe1e
+0,      89397,      89397,     1161,      424, 0x694bbdf0
+0,      90558,      90558,     1161,      424, 0x3f1ab970
+0,      91719,      91719,     1161,      424, 0x6114bbbe
+0,      92880,      92880,     1161,      424, 0xf67cc210
+0,      94041,      94041,     1161,      424, 0x9d9cbf4c
+0,      95202,      95202,     1161,      424, 0x72ecbe4e
+0,      96363,      96363,     1161,      424, 0x1bb4be96
+0,      97524,      97524,     1161,      424, 0x467cbc1c
+0,      98685,      98685,     1161,      424, 0x1b2abc80
+0,      99846,      99846,     1161,      424, 0xd0e3befc
diff --git a/tests/ref/fate/matroska-alac-remux b/tests/ref/fate/matroska-alac-remux
index d7d6eba47d..7f52c46563 100644
--- a/tests/ref/fate/matroska-alac-remux
+++ b/tests/ref/fate/matroska-alac-remux
@@ -1,139 +1,139 @@
-8c3da576105e9c29451855520c1c68d2 *tests/data/fate/matroska-alac-remux.matroska
-1293709 tests/data/fate/matroska-alac-remux.matroska
+191c5da7fc120ce83eba7616c90e575a *tests/data/fate/matroska-alac-remux.matroska
+1295222 tests/data/fate/matroska-alac-remux.matroska
 #extradata 0:       36, 0x562b05d8
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: alac
 #sample_rate 0: 44100
 #channel_layout_name 0: stereo
 0,          0,          0,        0,       32, 0xa0af0dfe
-0,         93,         93,        0,     6701, 0xa9ddc14e
-0,        186,        186,        0,     6639, 0x3ccda8d6
-0,        279,        279,        0,     5722, 0x99a8cdbb
-0,        372,        372,        0,     5442, 0xe94d8bd8
-0,        464,        464,        0,     5211, 0x19d23acb
-0,        557,        557,        0,     4843, 0x5c013b9c
-0,        650,        650,        0,     8351, 0x0df50d26
-0,        743,        743,        0,     5981, 0x1211487e
-0,        836,        836,        0,     5747, 0xec5219c6
-0,        929,        929,        0,     4956, 0x75b07b7a
-0,       1022,       1022,        0,     4856, 0xbd314cc0
-0,       1115,       1115,        0,     4805, 0x8a27192d
-0,       1207,       1207,        0,     7834, 0xafb5d3e8
-0,       1300,       1300,        0,     5535, 0x04f3a427
-0,       1393,       1393,        0,     5389, 0xc6cc2676
-0,       1486,       1486,        0,     6363, 0xad5a3d0f
-0,       1579,       1579,        0,     4526, 0x774aa96a
-0,       1672,       1672,        0,     4514, 0xbf5fc96d
-0,       1765,       1765,        0,     8487, 0x8b737a66
-0,       1858,       1858,        0,     8489, 0x1e913827
-0,       1950,       1950,        0,     7711, 0x97aa8e9b
-0,       2043,       2043,        0,     7686, 0x86038f56
-0,       2136,       2136,        0,     6116, 0x7fc6cd9e
-0,       2229,       2229,        0,     6022, 0xfb21af45
-0,       2322,       2322,        0,     9569, 0xc9804ce4
-0,       2415,       2415,        0,    10587, 0xce263cfd
-0,       2508,       2508,        0,    10659, 0x90ce6886
-0,       2601,       2601,        0,    10446, 0x07054263
-0,       2694,       2694,        0,    10031, 0x566c25a6
-0,       2786,       2786,        0,    10566, 0xfee0240c
-0,       2879,       2879,        0,    11322, 0x12aab358
-0,       2972,       2972,        0,    11834, 0x34c4841a
-0,       3065,       3065,        0,    11508, 0x49acb752
-0,       3158,       3158,        0,    11450, 0xddc7e5bd
-0,       3251,       3251,        0,    11540, 0x80c52fd9
-0,       3344,       3344,        0,    11538, 0xf858f2b8
-0,       3437,       3437,        0,    10981, 0x6b00eed1
-0,       3529,       3529,        0,    11963, 0xe163c9a2
-0,       3622,       3622,        0,    11329, 0x5312d147
-0,       3715,       3715,        0,    10858, 0x8b00c6ee
-0,       3808,       3808,        0,    11911, 0xebfca9ce
-0,       3901,       3901,        0,    11470, 0xf2e40d02
-0,       3994,       3994,        0,    11770, 0x9eb8b578
-0,       4087,       4087,        0,    11920, 0xd52de5cc
-0,       4180,       4180,        0,    11335, 0x1b18b87a
-0,       4272,       4272,        0,    10939, 0x6116ef53
-0,       4365,       4365,        0,    12400, 0xbbcecb8b
-0,       4458,       4458,        0,    11652, 0x82531ac1
-0,       4551,       4551,        0,    11033, 0x09e607c9
-0,       4644,       4644,        0,    10283, 0xfe50b7a9
-0,       4737,       4737,        0,    10104, 0x5a5933e0
-0,       4830,       4830,        0,     9500, 0x69f4256b
-0,       4923,       4923,        0,     9613, 0x00175893
-0,       5016,       5016,        0,     9896, 0xf76adae7
-0,       5108,       5108,        0,     9534, 0x383e2e5b
-0,       5201,       5201,        0,    12217, 0xa39f5168
-0,       5294,       5294,        0,    11105, 0xd30d3c9f
-0,       5387,       5387,        0,    11015, 0x59acdbba
-0,       5480,       5480,        0,    12211, 0xca5d6b4c
-0,       5573,       5573,        0,    11542, 0x479a08fa
-0,       5666,       5666,        0,    10163, 0x8c1c4aa9
-0,       5759,       5759,        0,    11849, 0xaa499f9d
-0,       5851,       5851,        0,    11418, 0x43e0e764
-0,       5944,       5944,        0,    10142, 0x61793ad4
-0,       6037,       6037,        0,    12080, 0x076c025d
-0,       6130,       6130,        0,    11550, 0xc6a9ec36
-0,       6223,       6223,        0,    10951, 0xe77cde41
-0,       6316,       6316,        0,    12367, 0xf2068f79
-0,       6409,       6409,        0,    11328, 0x894c7cd9
-0,       6502,       6502,        0,    10253, 0x7d038e2a
-0,       6594,       6594,        0,    12366, 0x8c789e8c
-0,       6687,       6687,        0,    11727, 0xdb10700c
-0,       6780,       6780,        0,    11118, 0x803e44ab
-0,       6873,       6873,        0,    10722, 0xec1b73da
-0,       6966,       6966,        0,    10471, 0x9d37fd29
-0,       7059,       7059,        0,    10402, 0xa3a1d01f
-0,       7152,       7152,        0,    10223, 0xeb1f72d3
-0,       7245,       7245,        0,    10302, 0x84b89df9
-0,       7338,       7338,        0,    10258, 0x1cbdac7b
-0,       7430,       7430,        0,    11669, 0xdab41e2e
-0,       7523,       7523,        0,    11404, 0x2c3aca64
-0,       7616,       7616,        0,    11256, 0xe08a91d9
-0,       7709,       7709,        0,    11408, 0x6b0ec296
-0,       7802,       7802,        0,    10776, 0x8dc36d7b
-0,       7895,       7895,        0,    11463, 0x4251f294
-0,       7988,       7988,        0,    11510, 0x6e4afda3
-0,       8081,       8081,        0,    11895, 0x699bbbbc
-0,       8173,       8173,        0,    11170, 0xabe65a6d
-0,       8266,       8266,        0,    11229, 0x90096c81
-0,       8359,       8359,        0,    11224, 0x05f170d8
-0,       8452,       8452,        0,    10850, 0xd886c267
-0,       8545,       8545,        0,    11713, 0x20b93e75
-0,       8638,       8638,        0,    11407, 0x435ccc58
-0,       8731,       8731,        0,    11180, 0x70dd503b
-0,       8824,       8824,        0,    11624, 0xb5df34b3
-0,       8916,       8916,        0,    12366, 0x9ddac5b3
-0,       9009,       9009,        0,    11480, 0xd75daf70
-0,       9102,       9102,        0,    11065, 0xc3b60d28
-0,       9195,       9195,        0,    10119, 0x91b7526d
-0,       9288,       9288,        0,     9941, 0xfae5c951
-0,       9381,       9381,        0,     9672, 0x38c250bb
-0,       9474,       9474,        0,     9240, 0x983fb45f
-0,       9567,       9567,        0,     9851, 0xff73b7a3
-0,       9660,       9660,        0,    10460, 0xc4b5f639
-0,       9752,       9752,        0,    11840, 0x0369a045
-0,       9845,       9845,        0,    11213, 0x7e358a78
-0,       9938,       9938,        0,    11099, 0x177e0c20
-0,      10031,      10031,        0,    11615, 0x5f9b41db
-0,      10124,      10124,        0,    11617, 0x35184b25
-0,      10217,      10217,        0,    10117, 0xb5e4857d
-0,      10310,      10310,        0,    11711, 0xf7da3053
-0,      10403,      10403,        0,    11669, 0x05eb475f
-0,      10495,      10495,        0,    11255, 0xe7c3587b
-0,      10588,      10588,        0,    12237, 0x1576764f
-0,      10681,      10681,        0,    11399, 0x9eaea010
-0,      10774,      10774,        0,    10927, 0x9128ed6a
-0,      10867,      10867,        0,    11920, 0x4da7b6e1
-0,      10960,      10960,        0,    11288, 0x8bdf7955
-0,      11053,      11053,        0,    10375, 0x7fc19e5e
-0,      11146,      11146,        0,    12142, 0xb64329cc
-0,      11238,      11238,        0,    11282, 0xaf38984a
-0,      11331,      11331,        0,    10259, 0x2984a344
-0,      11424,      11424,        0,    11569, 0x88a62c58
-0,      11517,      11517,        0,    11688, 0xfe3c4f2b
-0,      11610,      11610,        0,    11428, 0xc776073b
-0,      11703,      11703,        0,    10987, 0x2281046f
-0,      11796,      11796,        0,    11028, 0xfe3426c4
+0,       9288,       9288,        0,     6701, 0xa9ddc14e
+0,      18576,      18576,        0,     6639, 0x3ccda8d6
+0,      27864,      27864,        0,     5722, 0x99a8cdbb
+0,      37152,      37152,        0,     5442, 0xe94d8bd8
+0,      46440,      46440,        0,     5211, 0x19d23acb
+0,      55728,      55728,        0,     4843, 0x5c013b9c
+0,      65016,      65016,        0,     8351, 0x0df50d26
+0,      74304,      74304,        0,     5981, 0x1211487e
+0,      83592,      83592,        0,     5747, 0xec5219c6
+0,      92880,      92880,        0,     4956, 0x75b07b7a
+0,     102168,     102168,        0,     4856, 0xbd314cc0
+0,     111456,     111456,        0,     4805, 0x8a27192d
+0,     120744,     120744,        0,     7834, 0xafb5d3e8
+0,     130032,     130032,        0,     5535, 0x04f3a427
+0,     139320,     139320,        0,     5389, 0xc6cc2676
+0,     148608,     148608,        0,     6363, 0xad5a3d0f
+0,     157896,     157896,        0,     4526, 0x774aa96a
+0,     167184,     167184,        0,     4514, 0xbf5fc96d
+0,     176472,     176472,        0,     8487, 0x8b737a66
+0,     185760,     185760,        0,     8489, 0x1e913827
+0,     195048,     195048,        0,     7711, 0x97aa8e9b
+0,     204336,     204336,        0,     7686, 0x86038f56
+0,     213624,     213624,        0,     6116, 0x7fc6cd9e
+0,     222912,     222912,        0,     6022, 0xfb21af45
+0,     232200,     232200,        0,     9569, 0xc9804ce4
+0,     241488,     241488,        0,    10587, 0xce263cfd
+0,     250776,     250776,        0,    10659, 0x90ce6886
+0,     260063,     260063,        0,    10446, 0x07054263
+0,     269351,     269351,        0,    10031, 0x566c25a6
+0,     278639,     278639,        0,    10566, 0xfee0240c
+0,     287927,     287927,        0,    11322, 0x12aab358
+0,     297215,     297215,        0,    11834, 0x34c4841a
+0,     306503,     306503,        0,    11508, 0x49acb752
+0,     315791,     315791,        0,    11450, 0xddc7e5bd
+0,     325079,     325079,        0,    11540, 0x80c52fd9
+0,     334367,     334367,        0,    11538, 0xf858f2b8
+0,     343655,     343655,        0,    10981, 0x6b00eed1
+0,     352943,     352943,        0,    11963, 0xe163c9a2
+0,     362231,     362231,        0,    11329, 0x5312d147
+0,     371519,     371519,        0,    10858, 0x8b00c6ee
+0,     380807,     380807,        0,    11911, 0xebfca9ce
+0,     390095,     390095,        0,    11470, 0xf2e40d02
+0,     399383,     399383,        0,    11770, 0x9eb8b578
+0,     408671,     408671,        0,    11920, 0xd52de5cc
+0,     417959,     417959,        0,    11335, 0x1b18b87a
+0,     427247,     427247,        0,    10939, 0x6116ef53
+0,     436535,     436535,        0,    12400, 0xbbcecb8b
+0,     445823,     445823,        0,    11652, 0x82531ac1
+0,     455111,     455111,        0,    11033, 0x09e607c9
+0,     464399,     464399,        0,    10283, 0xfe50b7a9
+0,     473687,     473687,        0,    10104, 0x5a5933e0
+0,     482975,     482975,        0,     9500, 0x69f4256b
+0,     492263,     492263,        0,     9613, 0x00175893
+0,     501551,     501551,        0,     9896, 0xf76adae7
+0,     510839,     510839,        0,     9534, 0x383e2e5b
+0,     520127,     520127,        0,    12217, 0xa39f5168
+0,     529415,     529415,        0,    11105, 0xd30d3c9f
+0,     538703,     538703,        0,    11015, 0x59acdbba
+0,     547991,     547991,        0,    12211, 0xca5d6b4c
+0,     557279,     557279,        0,    11542, 0x479a08fa
+0,     566567,     566567,        0,    10163, 0x8c1c4aa9
+0,     575855,     575855,        0,    11849, 0xaa499f9d
+0,     585143,     585143,        0,    11418, 0x43e0e764
+0,     594431,     594431,        0,    10142, 0x61793ad4
+0,     603719,     603719,        0,    12080, 0x076c025d
+0,     613007,     613007,        0,    11550, 0xc6a9ec36
+0,     622295,     622295,        0,    10951, 0xe77cde41
+0,     631583,     631583,        0,    12367, 0xf2068f79
+0,     640871,     640871,        0,    11328, 0x894c7cd9
+0,     650159,     650159,        0,    10253, 0x7d038e2a
+0,     659447,     659447,        0,    12366, 0x8c789e8c
+0,     668735,     668735,        0,    11727, 0xdb10700c
+0,     678023,     678023,        0,    11118, 0x803e44ab
+0,     687311,     687311,        0,    10722, 0xec1b73da
+0,     696599,     696599,        0,    10471, 0x9d37fd29
+0,     705887,     705887,        0,    10402, 0xa3a1d01f
+0,     715175,     715175,        0,    10223, 0xeb1f72d3
+0,     724463,     724463,        0,    10302, 0x84b89df9
+0,     733751,     733751,        0,    10258, 0x1cbdac7b
+0,     743039,     743039,        0,    11669, 0xdab41e2e
+0,     752327,     752327,        0,    11404, 0x2c3aca64
+0,     761615,     761615,        0,    11256, 0xe08a91d9
+0,     770902,     770902,        0,    11408, 0x6b0ec296
+0,     780190,     780190,        0,    10776, 0x8dc36d7b
+0,     789478,     789478,        0,    11463, 0x4251f294
+0,     798766,     798766,        0,    11510, 0x6e4afda3
+0,     808054,     808054,        0,    11895, 0x699bbbbc
+0,     817342,     817342,        0,    11170, 0xabe65a6d
+0,     826630,     826630,        0,    11229, 0x90096c81
+0,     835918,     835918,        0,    11224, 0x05f170d8
+0,     845206,     845206,        0,    10850, 0xd886c267
+0,     854494,     854494,        0,    11713, 0x20b93e75
+0,     863782,     863782,        0,    11407, 0x435ccc58
+0,     873070,     873070,        0,    11180, 0x70dd503b
+0,     882358,     882358,        0,    11624, 0xb5df34b3
+0,     891646,     891646,        0,    12366, 0x9ddac5b3
+0,     900934,     900934,        0,    11480, 0xd75daf70
+0,     910222,     910222,        0,    11065, 0xc3b60d28
+0,     919510,     919510,        0,    10119, 0x91b7526d
+0,     928798,     928798,        0,     9941, 0xfae5c951
+0,     938086,     938086,        0,     9672, 0x38c250bb
+0,     947374,     947374,        0,     9240, 0x983fb45f
+0,     956662,     956662,        0,     9851, 0xff73b7a3
+0,     965950,     965950,        0,    10460, 0xc4b5f639
+0,     975238,     975238,        0,    11840, 0x0369a045
+0,     984526,     984526,        0,    11213, 0x7e358a78
+0,     993814,     993814,        0,    11099, 0x177e0c20
+0,    1003102,    1003102,        0,    11615, 0x5f9b41db
+0,    1012390,    1012390,        0,    11617, 0x35184b25
+0,    1021678,    1021678,        0,    10117, 0xb5e4857d
+0,    1030966,    1030966,        0,    11711, 0xf7da3053
+0,    1040254,    1040254,        0,    11669, 0x05eb475f
+0,    1049542,    1049542,        0,    11255, 0xe7c3587b
+0,    1058830,    1058830,        0,    12237, 0x1576764f
+0,    1068118,    1068118,        0,    11399, 0x9eaea010
+0,    1077406,    1077406,        0,    10927, 0x9128ed6a
+0,    1086694,    1086694,        0,    11920, 0x4da7b6e1
+0,    1095982,    1095982,        0,    11288, 0x8bdf7955
+0,    1105270,    1105270,        0,    10375, 0x7fc19e5e
+0,    1114558,    1114558,        0,    12142, 0xb64329cc
+0,    1123846,    1123846,        0,    11282, 0xaf38984a
+0,    1133134,    1133134,        0,    10259, 0x2984a344
+0,    1142422,    1142422,        0,    11569, 0x88a62c58
+0,    1151710,    1151710,        0,    11688, 0xfe3c4f2b
+0,    1160998,    1160998,        0,    11428, 0xc776073b
+0,    1170286,    1170286,        0,    10987, 0x2281046f
+0,    1179574,    1179574,        0,    11028, 0xfe3426c4
 [STREAM]
 DISPOSITION:default=1
 DISPOSITION:dub=0
diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts
index 22959695ec..1ae44f9df6 100644
--- a/tests/ref/fate/matroska-avoid-negative-ts
+++ b/tests/ref/fate/matroska-avoid-negative-ts
@@ -1,41 +1,41 @@
-fb4e7a969ef65f61c4c45d5976188aa2 *tests/data/fate/matroska-avoid-negative-ts.matroska
-973080 tests/data/fate/matroska-avoid-negative-ts.matroska
+bc4f3ac974f0dc61ff661982b113db5f *tests/data/fate/matroska-avoid-negative-ts.matroska
+973821 tests/data/fate/matroska-avoid-negative-ts.matroska
 #extradata 0:       22, 0x2885037c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: video
 #codec_id 0: mpeg2video
 #dimensions 0: 352x288
 #sar 0: 12/11
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: mp3
 #sample_rate 1: 44100
 #channel_layout_name 1: mono
-0,        -37,         43,       40,     9156, 0xe5bd034a
-1,          0,          0,       26,      417, 0x7198c15e
-0,          3,          3,       40,     1740, 0x29ac4480, F=0x0
-1,         26,         26,       26,      417, 0x3c67c32d
-0,         43,        123,       40,     3672, 0x98652013, F=0x0
-1,         52,         52,       26,      417, 0x8c24b1ca
-1,         78,         78,       26,      417, 0x6ee576b7
-0,         83,         83,       40,     2532, 0xa2c42769, F=0x0
-1,        104,        104,       26,      417, 0x407603db
-0,        123,        203,       40,     1728, 0xae823d3b, F=0x0
-1,        130,        130,       26,      417, 0xcf2804d2
-1,        156,        156,       26,      417, 0xcf2804d2
-0,        163,        163,       40,     1028, 0x286ac52a, F=0x0
-1,        182,        182,       26,      417, 0xcf2804d2
-0,        203,        283,       40,     1916, 0xd378899e, F=0x0
-1,        208,        208,       26,      417, 0xcf2804d2
-1,        235,        235,       26,      417, 0xcf2804d2
-0,        243,        243,       40,     1168, 0x424e12cf, F=0x0
-1,        261,        261,       26,      417, 0xcf2804d2
-0,        283,        363,       40,     1660, 0x5cec156c, F=0x0
-1,        287,        287,       26,      417, 0xcf2804d2
-1,        313,        313,       26,      417, 0xef163d04
-0,        323,        323,       40,     1004, 0xac0dce29, F=0x0
-1,        339,        339,       26,      417, 0x2a009b3a
-0,        363,        443,       40,     3008, 0x0fc798bf, F=0x0
-1,        365,        365,       26,      417, 0xbedccb9d
-1,        365,        365,       26,      417, 0x2214be3f
-1,        391,        391,       26,      417, 0x8953b878
+0,      -3662,       4338,     4000,     9156, 0xe5bd034a
+1,          0,          0,     2612,      417, 0x7198c15e
+0,        338,        338,     4000,     1740, 0x29ac4480, F=0x0
+1,       2612,       2612,     2612,      417, 0x3c67c32d
+0,       4338,      12338,     4000,     3672, 0x98652013, F=0x0
+1,       5224,       5224,     2612,      417, 0x8c24b1ca
+1,       7837,       7837,     2612,      417, 0x6ee576b7
+0,       8338,       8338,     4000,     2532, 0xa2c42769, F=0x0
+1,      10449,      10449,     2612,      417, 0x407603db
+0,      12338,      20338,     4000,     1728, 0xae823d3b, F=0x0
+1,      13061,      13061,     2612,      417, 0xcf2804d2
+1,      15673,      15673,     2612,      417, 0xcf2804d2
+0,      16338,      16338,     4000,     1028, 0x286ac52a, F=0x0
+1,      18286,      18286,     2612,      417, 0xcf2804d2
+0,      20338,      28338,     4000,     1916, 0xd378899e, F=0x0
+1,      20898,      20898,     2612,      417, 0xcf2804d2
+1,      23510,      23510,     2612,      417, 0xcf2804d2
+0,      24338,      24338,     4000,     1168, 0x424e12cf, F=0x0
+1,      26122,      26122,     2612,      417, 0xcf2804d2
+0,      28338,      36338,     4000,     1660, 0x5cec156c, F=0x0
+1,      28735,      28735,     2612,      417, 0xcf2804d2
+1,      31347,      31347,     2612,      417, 0xef163d04
+0,      32338,      32338,     4000,     1004, 0xac0dce29, F=0x0
+1,      33959,      33959,     2612,      417, 0x2a009b3a
+0,      36338,      44338,     4000,     3008, 0x0fc798bf, F=0x0
+1,      36571,      36571,     2612,      417, 0xbedccb9d
+1,      36571,      36571,     2612,      417, 0x2214be3f
+1,      39184,      39184,     2612,      417, 0x8953b878
diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8
index 6b38ad8806..90299b5118 100644
--- a/tests/ref/fate/matroska-dovi-write-config8
+++ b/tests/ref/fate/matroska-dovi-write-config8
@@ -1,49 +1,49 @@
-c10db6bfab4b9b2344c7e7f92e8998de *tests/data/fate/matroska-dovi-write-config8.matroska
-3600558 tests/data/fate/matroska-dovi-write-config8.matroska
+fbb499078b671ad012c1bbd5ec7b78e2 *tests/data/fate/matroska-dovi-write-config8.matroska
+3601876 tests/data/fate/matroska-dovi-write-config8.matroska
 #extradata 0:      551, 0xb1ddcd66
 #extradata 1:        2, 0x00340022
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: video
 #codec_id 0: hevc
 #dimensions 0: 1920x1080
 #sar 0: 0/1
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: aac
 #sample_rate 1: 44100
 #channel_layout_name 1: stereo
-0,        -67,          0,       33,    63375, 0xc76606ab
-0,        -34,        133,       33,    46706, 0x0e08a7e5, F=0x0
-0,          0,         67,       33,    29766, 0x753c031a, F=0x0
-1,          0,          0,       23,        6, 0x031e0108
-1,         23,         23,       23,      251, 0x6b4a7cbd
-0,         33,         33,       33,    19409, 0x4b948b6c, F=0x0
-1,         46,         46,       23,      389, 0x6673c205
-0,         67,        100,       33,    21086, 0x1b9412ce, F=0x0
-1,         70,         70,       23,      356, 0x8c71a316
-1,         93,         93,       23,      339, 0x3018a45a
-0,        100,        267,       33,    62043, 0xc2356b56, F=0x0
-1,        116,        116,       23,      405, 0xc89ebe05
-0,        133,        200,       33,    36175, 0x0a7df38c, F=0x0
-1,        139,        139,       23,      449, 0x42eadf96
-1,        163,        163,       23,      416, 0x28a7c9b9
-0,        167,        167,       33,    16028, 0xa57fcbe9, F=0x0
-1,        186,        186,       23,      426, 0x9a74d4ec
-0,        200,        233,       33,    15428, 0x9a91f357, F=0x0
-1,        209,        209,       23,      419, 0xbe3dc54b
-1,        232,        232,       23,      424, 0x5102d50e
-0,        233,        400,       33,    66072, 0xa542b6d7, F=0x0
-1,        255,        255,       23,      402, 0xb11cc14c
-0,        267,        333,       33,    34985, 0xbfd8ff45, F=0x0
-1,        279,        279,       23,      401, 0x3820b8f9
-0,        300,        300,       33,    16036, 0xfc39c6ea, F=0x0
-1,        302,        302,       23,      400, 0xe5c4c168
-1,        325,        325,       23,      435, 0x6dbecc33
-0,        333,        367,       33,    19893, 0x7e746f4e, F=0x0
-1,        348,        348,       23,      441, 0x0ad3d199
-0,        367,        533,       33,    77576, 0xeba2e5c8, F=0x0
-1,        372,        372,       23,      479, 0x44dce967
-1,        395,        395,       23,      439, 0x7d85e4c9
+0,      -6670,          0,     3333,    63375, 0xc76606ab
+0,      -3337,      13333,     3333,    46706, 0x0e08a7e5, F=0x0
+0,          0,       6667,     3333,    29766, 0x753c031a, F=0x0
+1,          0,          0,     2322,        6, 0x031e0108
+1,       2322,       2322,     2322,      251, 0x6b4a7cbd
+0,       3333,       3333,     3333,    19409, 0x4b948b6c, F=0x0
+1,       4644,       4644,     2322,      389, 0x6673c205
+0,       6667,      10000,     3333,    21086, 0x1b9412ce, F=0x0
+1,       6966,       6966,     2322,      356, 0x8c71a316
+1,       9288,       9288,     2322,      339, 0x3018a45a
+0,      10000,      26667,     3333,    62043, 0xc2356b56, F=0x0
+1,      11610,      11610,     2322,      405, 0xc89ebe05
+0,      13333,      20000,     3333,    36175, 0x0a7df38c, F=0x0
+1,      13932,      13932,     2322,      449, 0x42eadf96
+1,      16254,      16254,     2322,      416, 0x28a7c9b9
+0,      16667,      16667,     3333,    16028, 0xa57fcbe9, F=0x0
+1,      18576,      18576,     2322,      426, 0x9a74d4ec
+0,      20000,      23333,     3333,    15428, 0x9a91f357, F=0x0
+1,      20898,      20898,     2322,      419, 0xbe3dc54b
+1,      23220,      23220,     2322,      424, 0x5102d50e
+0,      23333,      40000,     3333,    66072, 0xa542b6d7, F=0x0
+1,      25542,      25542,     2322,      402, 0xb11cc14c
+0,      26667,      33333,     3333,    34985, 0xbfd8ff45, F=0x0
+1,      27864,      27864,     2322,      401, 0x3820b8f9
+0,      30000,      30000,     3333,    16036, 0xfc39c6ea, F=0x0
+1,      30186,      30186,     2322,      400, 0xe5c4c168
+1,      32508,      32508,     2322,      435, 0x6dbecc33
+0,      33333,      36667,     3333,    19893, 0x7e746f4e, F=0x0
+1,      34830,      34830,     2322,      441, 0x0ad3d199
+0,      36667,      53333,     3333,    77576, 0xeba2e5c8, F=0x0
+1,      37152,      37152,     2322,      479, 0x44dce967
+1,      39474,      39474,     2322,      439, 0x7d85e4c9
 [STREAM]
 [SIDE_DATA]
 side_data_type=Display Matrix
diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay
index 833ce827e2..64e6896435 100644
--- a/tests/ref/fate/matroska-encoding-delay
+++ b/tests/ref/fate/matroska-encoding-delay
@@ -1,38 +1,38 @@
-ef9e4953d3814dcd548c37ecb743ff65 *tests/data/fate/matroska-encoding-delay.matroska
-961246 tests/data/fate/matroska-encoding-delay.matroska
+bea95e8b4aca54240532ae8bd17267fa *tests/data/fate/matroska-encoding-delay.matroska
+961251 tests/data/fate/matroska-encoding-delay.matroska
 #extradata 0:       22, 0x32ea0490
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: video
 #codec_id 0: mpeg2video
 #dimensions 0: 720x608
 #sar 0: 152/135
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: mp2
 #sample_rate 1: 48000
 #channel_layout_name 1: stereo
-1,        -10,        -10,       24,     1152, 0x724077b8, S=1, Skip Samples,       10, 0x08d300e2
-0,          0,          0,       40,   237628, 0xeff25579
-1,         14,         14,       24,     1152, 0x80625572
-1,         38,         38,       24,     1152, 0x7d7f4dce
-0,         40,         40,       40,   238066, 0xb2265f41
-1,         62,         62,       24,     1152, 0xa6725739
-0,         80,         80,       40,   237723, 0x00d7cd24
-1,         86,         86,       24,     1152, 0xc9e85398
-1,        110,        110,       24,     1152, 0xda1287d3
-0,        120,        120,       40,   238290, 0xbe18b18f
-1,        134,        134,       24,     1152, 0x1c9a6102
+1,      -1002,      -1002,     2400,     1152, 0x724077b8, S=1, Skip Samples,       10, 0x08d300e2
+0,          0,          0,     4000,   237628, 0xeff25579
+1,       1398,       1398,     2400,     1152, 0x80625572
+1,       3798,       3798,     2400,     1152, 0x7d7f4dce
+0,       4000,       4000,     4000,   238066, 0xb2265f41
+1,       6198,       6198,     2400,     1152, 0xa6725739
+0,       8000,       8000,     4000,   237723, 0x00d7cd24
+1,       8598,       8598,     2400,     1152, 0xc9e85398
+1,      10998,      10998,     2400,     1152, 0xda1287d3
+0,      12000,      12000,     4000,   238290, 0xbe18b18f
+1,      13398,      13398,     2400,     1152, 0x1c9a6102
 [PACKET]
 codec_type=audio
 stream_index=1
-pts=-10
-pts_time=-0.010000
-dts=-10
-dts_time=-0.010000
-duration=24
+pts=-1002
+pts_time=-0.010020
+dts=-1002
+dts_time=-0.010020
+duration=2400
 duration_time=0.024000
 size=1152
-pos=1263
+pos=1262
 flags=K__
 [SIDE_DATA]
 side_data_type=Skip Samples
@@ -49,33 +49,33 @@ pts=0
 pts_time=0.000000
 dts=0
 dts_time=0.000000
-duration=40
+duration=4000
 duration_time=0.040000
 size=237628
-pos=2423
+pos=2422
 flags=K__
 [/PACKET]
 [PACKET]
 codec_type=audio
 stream_index=1
-pts=14
-pts_time=0.014000
-dts=14
-dts_time=0.014000
-duration=24
+pts=1398
+pts_time=0.013980
+dts=1398
+dts_time=0.013980
+duration=2400
 duration_time=0.024000
 size=1152
-pos=240058
+pos=240057
 flags=K__
 [/PACKET]
 [PACKET]
 codec_type=audio
 stream_index=1
-pts=38
-pts_time=0.038000
-dts=38
-dts_time=0.038000
-duration=24
+pts=3798
+pts_time=0.037980
+dts=3798
+dts_time=0.037980
+duration=2400
 duration_time=0.024000
 size=1152
 pos=241233
@@ -84,11 +84,11 @@ flags=K__
 [PACKET]
 codec_type=video
 stream_index=0
-pts=40
+pts=4000
 pts_time=0.040000
-dts=40
+dts=4000
 dts_time=0.040000
-duration=40
+duration=4000
 duration_time=0.040000
 size=238066
 pos=242393
diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update
index 79acbb7426..7b03cd8322 100644
--- a/tests/ref/fate/matroska-flac-extradata-update
+++ b/tests/ref/fate/matroska-flac-extradata-update
@@ -1,44 +1,44 @@
-75ec39f0faaaff953e2d46b431acc307 *tests/data/fate/matroska-flac-extradata-update.matroska
-1828 tests/data/fate/matroska-flac-extradata-update.matroska
+d2a3d0d94119043c3293b86bc137be94 *tests/data/fate/matroska-flac-extradata-update.matroska
+1956 tests/data/fate/matroska-flac-extradata-update.matroska
 #extradata 0:       34, 0x7166090c
 #extradata 1:       34, 0x7166090c
 #extradata 2:       34, 0x7166090c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: flac
 #sample_rate 0: 48000
 #channel_layout_name 0: 5.1
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: flac
 #sample_rate 1: 48000
 #channel_layout_name 1: 5.1(side)
-#tb 2: 1/1000
+#tb 2: 1/100000
 #media_type 2: audio
 #codec_id 2: flac
 #sample_rate 2: 48000
 #channel_layout_name 2: 5.1
-0,          0,          0,       85,       26, 0x50f80431
-1,          0,          0,       85,       26, 0x50f80431
-2,          0,          0,       85,       26, 0x50f80431
-0,         85,         85,       85,       26, 0x50d30416
-1,         85,         85,       85,       26, 0x50d30416
-2,         85,         85,       85,       26, 0x50d30416
-0,        171,        171,       85,       26, 0x51ee046f
-1,        171,        171,       85,       26, 0x51ee046f
-2,        171,        171,       85,       26, 0x51ee046f
-0,        256,        256,       85,       26, 0x521d0458
-1,        256,        256,       85,       26, 0x521d0458
-2,        256,        256,       85,       26, 0x521d0458
-0,        341,        341,       85,       26, 0x531c043d
-1,        341,        341,       85,       26, 0x531c043d
-2,        341,        341,       85,       26, 0x531c043d
-0,        427,        427,       85,       26, 0x53cf0442
-1,        427,        427,       85,       26, 0x53cf0442
-2,        427,        427,       85,       26, 0x53cf0442
-0,        512,        512,       85,       26, 0x536a0473
-1,        512,        512,       85,       26, 0x536a0473
-2,        512,        512,       85,       26, 0x536a0473
-0,        597,        597,       85,       26, 0x5321046c
-1,        597,        597,       85,       26, 0x5321046c
-2,        597,        597,       85,       26, 0x5321046c
+0,          0,          0,     8533,       26, 0x50f80431
+1,          0,          0,     8533,       26, 0x50f80431
+2,          0,          0,     8533,       26, 0x50f80431
+0,       8533,       8533,     8533,       26, 0x50d30416
+1,       8533,       8533,     8533,       26, 0x50d30416
+2,       8533,       8533,     8533,       26, 0x50d30416
+0,      17065,      17065,     8533,       26, 0x51ee046f
+1,      17065,      17065,     8533,       26, 0x51ee046f
+2,      17065,      17065,     8533,       26, 0x51ee046f
+0,      25598,      25598,     8533,       26, 0x521d0458
+1,      25598,      25598,     8533,       26, 0x521d0458
+2,      25598,      25598,     8533,       26, 0x521d0458
+0,      34133,      34133,     8533,       26, 0x531c043d
+1,      34133,      34133,     8533,       26, 0x531c043d
+2,      34133,      34133,     8533,       26, 0x531c043d
+0,      42667,      42667,     8533,       26, 0x53cf0442
+1,      42667,      42667,     8533,       26, 0x53cf0442
+2,      42667,      42667,     8533,       26, 0x53cf0442
+0,      51198,      51198,     8533,       26, 0x536a0473
+1,      51198,      51198,     8533,       26, 0x536a0473
+2,      51198,      51198,     8533,       26, 0x536a0473
+0,      59731,      59731,     8533,       26, 0x5321046c
+1,      59731,      59731,     8533,       26, 0x5321046c
+2,      59731,      59731,     8533,       26, 0x5321046c
diff --git a/tests/ref/fate/matroska-h264-pcm96k-remux b/tests/ref/fate/matroska-h264-pcm96k-remux
index 0ef96a4322..d12be2a968 100644
--- a/tests/ref/fate/matroska-h264-pcm96k-remux
+++ b/tests/ref/fate/matroska-h264-pcm96k-remux
@@ -1,33 +1,33 @@
-8ce6b406f67a8dc76d7bf54575999f08 *tests/data/fate/matroska-h264-pcm96k-remux.matroska
-871259 tests/data/fate/matroska-h264-pcm96k-remux.matroska
+cacdddb8267889a135055ae20ae50351 *tests/data/fate/matroska-h264-pcm96k-remux.matroska
+871678 tests/data/fate/matroska-h264-pcm96k-remux.matroska
 #extradata 0:       35, 0xc3b20b70
-#tb 0: 1/1000
+#tb 0: 1/100000
 #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
+0,      -4167,          0,     4200,    63501, 0x139d4c99
+0,          0,       8400,     4200,     5368, 0xd964b678, F=0x0
+0,       4200,       4200,     4200,     1840, 0x097b6726, F=0x0
+0,       8400,      16700,     4200,     7168, 0xaa5913ed, F=0x0
+0,      12500,      12500,     4200,     2129, 0x6ab0db3e, F=0x0
+0,      16700,      25000,     4200,     7230, 0x3fd63940, F=0x0
+0,      20900,      20900,     4200,     2114, 0xfceafb26, F=0x0
+0,      25000,      33400,     4200,    63420, 0x5ca6250f, F=0x0
+0,      29200,      29200,     4200,    16751, 0xf293ab46, F=0x0
+0,      33400,      41700,     4200,    22029, 0x3696462b, F=0x0
+0,      37500,      37500,     4200,     5044, 0xa0344ae6, F=0x0
+0,      41700,      50000,     4200,    25289, 0x46f9a219, F=0x0
+0,      45900,      45900,     4200,    12871, 0x23e570c4, F=0x0
+0,      50000,      58400,     4200,    29580, 0xd051ad0c, F=0x0
+0,      54200,      54200,     4200,     9221, 0xfa1bdf6c, F=0x0
+0,      58400,      66700,     4200,    22238, 0x4e0daf3e, F=0x0
+0,      62500,      62500,     4200,     7627, 0xc566337e, F=0x0
+0,      66700,      75000,     4200,    23124, 0x3bad1f16, F=0x0
+0,      70900,      70900,     4200,     7093, 0x3ab77cce, F=0x0
+0,      75000,      83400,     4200,    23210, 0xa7851bbf, F=0x0
+0,      79200,      79200,     4200,    16045, 0x33039eb5, F=0x0
+0,      83400,      91700,     4200,    24859, 0x317ea0f2, F=0x0
+0,      87500,      87500,     4200,     7589, 0x02a8e5d5, F=0x0
+0,      91700,      95900,     4200,    19208, 0xdfb1a109, F=0x0
+0,      95900,     200000,     4200,    60241, 0x43fcc627
diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux
index 7a0d999095..80d321adec 100644
--- a/tests/ref/fate/matroska-h264-remux
+++ b/tests/ref/fate/matroska-h264-remux
@@ -1,5 +1,5 @@
-c96a6298ccfd1fa0b8b1ef38d4244556 *tests/data/fate/matroska-h264-remux.matroska
-2036805 tests/data/fate/matroska-h264-remux.matroska
+737e50cc2aa78ede81f3646661879ccb *tests/data/fate/matroska-h264-remux.matroska
+2037041 tests/data/fate/matroska-h264-remux.matroska
 #tb 0: 1/25
 #media_type 0: video
 #codec_id 0: rawvideo
diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata
index 8b5313cef2..cdd1d9c74b 100644
--- a/tests/ref/fate/matroska-mastering-display-metadata
+++ b/tests/ref/fate/matroska-mastering-display-metadata
@@ -1,46 +1,46 @@
-bdca53906b34c57192416a0f737b885e *tests/data/fate/matroska-mastering-display-metadata.matroska
-1669723 tests/data/fate/matroska-mastering-display-metadata.matroska
+8d449e76a98adc5ef2427069c21454c9 *tests/data/fate/matroska-mastering-display-metadata.matroska
+1669732 tests/data/fate/matroska-mastering-display-metadata.matroska
 #extradata 0:        4, 0x040901a3
 #extradata 3:      201, 0x9a706279
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: video
 #codec_id 0: prores
 #dimensions 0: 1280x720
 #sar 0: 1/1
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: pcm_s24le
 #sample_rate 1: 48000
 #channel_layout_name 1: mono
-#tb 2: 1/1000
+#tb 2: 1/100000
 #media_type 2: audio
 #codec_id 2: pcm_s16be
 #sample_rate 2: 48000
 #channel_layout_name 2: mono
-#tb 3: 1/1000
+#tb 3: 1/100000
 #media_type 3: video
 #codec_id 3: ffv1
 #dimensions 3: 1280x720
 #sar 3: 1/1
-0,          0,          0,       17,    57008, 0x43416399
-1,          0,          0,       16,     2403, 0xaa818522
-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,       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,       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,       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,       17,   270553, 0x36d83705, F=0x0
+0,          0,          0,     1668,    57008, 0x43416399
+1,          0,          0,     1668,     2403, 0xaa818522
+3,          0,          0,     1668,   274884, 0x775840e5
+0,       1668,       1668,     1668,    57248, 0xa06cd7b5
+3,       1668,       1668,     1668,   273716, 0xa41fc5e3, F=0x0
+1,       1669,       1669,     1668,     2403, 0xe1a991e5
+2,       1669,       1669,     1668,     1602, 0x5d868171
+0,       3337,       3337,     1668,    57200, 0x5623da10
+3,       3337,       3337,     1668,   272838, 0x3c308d03, F=0x0
+1,       3338,       3338,     1666,     2400, 0x6650907f
+2,       3338,       3338,     1666,     1600, 0xa90f0044
+1,       5004,       5004,     1668,     2403, 0x43398a08
+2,       5004,       5004,     1668,     1602, 0x3a350084
+0,       5005,       5005,     1668,    57152, 0x52d89d3f
+3,       5005,       5005,     1668,   271251, 0xe802cc77, F=0x0
+0,       6673,       6673,     1668,    56960, 0x431d5189
+1,       6673,       6673,     1668,     2403, 0x61cd96cb
+2,       6673,       6673,     1668,     1602, 0xd74800c6
+3,       6673,       6673,     1668,   270553, 0x36d83705, F=0x0
 [STREAM]
 index=0
 codec_name=prores
diff --git a/tests/ref/fate/matroska-move-cues-to-front b/tests/ref/fate/matroska-move-cues-to-front
index 1af5b1fab4..3c8fceb0ba 100644
--- a/tests/ref/fate/matroska-move-cues-to-front
+++ b/tests/ref/fate/matroska-move-cues-to-front
@@ -1,16 +1,16 @@
-deeb9e63e52e015e5f7f592f3417f385 *tests/data/fate/matroska-move-cues-to-front.matroska
-23056700 tests/data/fate/matroska-move-cues-to-front.matroska
-#tb 0: 1/1000
+100d7b4839b6a836a67cab7e7564b36d *tests/data/fate/matroska-move-cues-to-front.matroska
+23057055 tests/data/fate/matroska-move-cues-to-front.matroska
+#tb 0: 1/1000000
 #media_type 0: audio
 #codec_id 0: pcm_s24be
 #sample_rate 0: 192000
 #channel_layout_name 0: stereo
-#tb 1: 1/1000
+#tb 1: 1/1000000
 #media_type 1: audio
 #codec_id 1: pcm_s24le
 #sample_rate 1: 192000
 #channel_layout_name 1: stereo
-0,          0,          0,       85,    98304, 0x4acbdd0a
-1,          0,          0,       85,    98304, 0x83cddd0a
-0,         85,         85,       85,    98304, 0x8f975bc7
-1,         85,         85,       85,    98304, 0xdd315bc7
+0,          0,          0,    85333,    98304, 0x4acbdd0a
+1,          0,          0,    85333,    98304, 0x83cddd0a
+0,      85333,      85333,    85333,    98304, 0x8f975bc7
+1,      85333,      85333,    85333,    98304, 0xdd315bc7
diff --git a/tests/ref/fate/matroska-mpegts-remux b/tests/ref/fate/matroska-mpegts-remux
index 491e255d75..c1101e5366 100644
--- a/tests/ref/fate/matroska-mpegts-remux
+++ b/tests/ref/fate/matroska-mpegts-remux
@@ -1,23 +1,23 @@
-48fcc343d88d0ffaba9223150fb0a195 *tests/data/fate/matroska-mpegts-remux.matroska
-6516 tests/data/fate/matroska-mpegts-remux.matroska
-#tb 0: 1/1000
+d9e813c2d725533ad933003a37992099 *tests/data/fate/matroska-mpegts-remux.matroska
+6515 tests/data/fate/matroska-mpegts-remux.matroska
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: ac3
 #sample_rate 0: 48000
 #channel_layout_name 0: stereo
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: ac3
 #sample_rate 1: 48000
 #channel_layout_name 1: stereo
-0,          0,          0,       32,      768, 0xa63778d4
-1,          0,          0,       32,      768, 0xa63778d4
-0,         32,         32,       32,      768, 0x7d577f3f
-1,         32,         32,       32,      768, 0x7d577f3f
-0,         64,         64,       32,      768, 0xd86b7c8f
-1,         64,         64,       32,      768, 0xd86b7c8f
-0,         96,         96,       32,      626, 0x09f4382f
-1,         96,         96,       32,      626, 0x09f4382f
+0,          0,          0,     3200,      768, 0xa63778d4
+1,          0,          0,     3200,      768, 0xa63778d4
+0,       3200,       3200,     3200,      768, 0x7d577f3f
+1,       3200,       3200,     3200,      768, 0x7d577f3f
+0,       6400,       6400,     3200,      768, 0xd86b7c8f
+1,       6400,       6400,     3200,      768, 0xd86b7c8f
+0,       9600,       9600,     3200,      626, 0x09f4382f
+1,       9600,       9600,     3200,      626, 0x09f4382f
 [STREAM]
 index=0
 DISPOSITION:default=1
diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode
index 4b6b0e9ccf..e83eff3142 100644
--- a/tests/ref/fate/matroska-ms-mode
+++ b/tests/ref/fate/matroska-ms-mode
@@ -1,88 +1,88 @@
-e7f44cd6a5c0f45fea11874afb8c1c0d *tests/data/fate/matroska-ms-mode.matroska
-413103 tests/data/fate/matroska-ms-mode.matroska
+9e65e660de30d2e37c3285a35b5247bd *tests/data/fate/matroska-ms-mode.matroska
+413281 tests/data/fate/matroska-ms-mode.matroska
 #extradata 0:       40, 0x54290c93
 #extradata 1:      114, 0xb6c80771
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: video
 #codec_id 0: vp5
 #dimensions 0: 512x304
 #sar 0: 0/1
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: speex
 #sample_rate 1: 32000
 #channel_layout_name 1: mono
-0,          0,          0,       42,    12972, 0x6588cf8e
+0,          0,          0,     4171,    12972, 0x6588cf8e
 1,          0,          0,        0,       74, 0xd4eb274d
-1,         20,         20,        0,       74, 0xef822181
-1,         40,         40,        0,       74, 0x61e3239c
-0,         42,         42,       42,      478, 0xeca1eeb9
-1,         60,         60,        0,       74, 0x474623d5
-1,         80,         80,        0,       74, 0x79a21f22
-0,         83,         83,       42,      260, 0x335f8133
-1,        100,        100,        0,       74, 0xb3022058
-1,        120,        120,        0,       74, 0x57a32240
-0,        125,        125,       42,      199, 0xf6f86142
-1,        140,        140,        0,       74, 0x34892453
-1,        160,        160,        0,       74, 0x55621efb
-0,        167,        167,       42,      188, 0x0eeb5f55
-1,        180,        180,        0,       74, 0xb92f206a
-1,        200,        200,        0,       74, 0x1988222e
-0,        209,        209,       42,      183, 0x921a5b3c
-1,        220,        220,        0,       74, 0x033b20dc
-1,        240,        240,        0,       74, 0xf8f41da4
-0,        250,        250,       42,      181, 0xae765703
-1,        260,        260,        0,       74, 0xfc89201f
-1,        280,        280,        0,       74, 0x2b102428
-0,        292,        292,       42,      181, 0xdc975d93
-1,        300,        300,        0,       74, 0x2df42380
-1,        320,        320,        0,       74, 0xebcf20fd
-0,        334,        334,       42,      181, 0x30355b73
-1,        340,        340,        0,       74, 0x3eb524f8
-1,        360,        360,        0,       74, 0x1f802308
-0,        375,        375,       42,      179, 0xef275e89
-1,        380,        380,        0,       74, 0x218d23bd
-1,        400,        400,        0,       74, 0x77f82421
-0,        417,        417,       42,      181, 0xbdb35a1b
-1,        420,        420,        0,       74, 0xf20023a3
-1,        440,        440,        0,       74, 0x82cc1f9a
-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,       42,      181, 0x30355b73
-1,        520,        520,        0,       74, 0x85e02092
-1,        540,        540,        0,       74, 0xb9d02059
-0,        542,        542,       42,      179, 0xef275e89
-1,        560,        560,        0,       74, 0xbbd8211f
-1,        580,        580,        0,       74, 0xe0ca20e1
-0,        584,        584,       42,      181, 0xbdb35a1b
-1,        600,        600,        0,       74, 0xd4f9216b
-1,        620,        620,        0,       74, 0xdea723f9
-0,        626,        626,       42,      179, 0x1b245f55
-1,        640,        640,        0,       74, 0xc2611fe9
-1,        660,        660,        0,       74, 0x9f941f2d
-0,        667,        667,       42,      181, 0x30355b73
-1,        680,        680,        0,       74, 0xaf991eb9
-1,        700,        700,        0,       74, 0x7e79250e
-0,        709,        709,       42,      179, 0xef275e89
-1,        720,        720,        0,       74, 0x5a421faa
-1,        740,        740,        0,       74, 0x3b211ce0
-0,        751,        751,       42,      181, 0xbdb35a1b
-1,        760,        760,        0,       74, 0x4a812478
-1,        780,        780,        0,       74, 0xfc1b234f
-0,        792,        792,       42,      179, 0x1b245f55
-1,        800,        800,        0,       74, 0x3d561db1
-1,        820,        820,        0,       74, 0x6bbb2475
-0,        834,        834,       42,      181, 0x30355b73
-1,        840,        840,        0,       74, 0x76fe1f63
-1,        860,        860,        0,       74, 0x15861cf1
-0,        876,        876,       42,      179, 0xef275e89
-1,        880,        880,        0,       74, 0x7dca1c6a
-1,        900,        900,        0,       74, 0xad8b20aa
-0,        918,        918,       42,      181, 0xbdb35a1b
-1,        920,        920,        0,       74, 0x6ba01e89
-1,        940,        940,        0,       74, 0x621421eb
-0,        959,        959,       42,      179, 0x1b245f55
-1,        960,        960,        0,       74, 0x26672424
-1,        980,        980,        0,       74, 0xcb6120f4
+1,       2000,       2000,        0,       74, 0xef822181
+1,       4000,       4000,        0,       74, 0x61e3239c
+0,       4171,       4171,     4171,      478, 0xeca1eeb9
+1,       6000,       6000,        0,       74, 0x474623d5
+1,       8000,       8000,        0,       74, 0x79a21f22
+0,       8342,       8342,     4171,      260, 0x335f8133
+1,      10000,      10000,        0,       74, 0xb3022058
+1,      12000,      12000,        0,       74, 0x57a32240
+0,      12513,      12513,     4171,      199, 0xf6f86142
+1,      14000,      14000,        0,       74, 0x34892453
+1,      16000,      16000,        0,       74, 0x55621efb
+0,      16683,      16683,     4171,      188, 0x0eeb5f55
+1,      18000,      18000,        0,       74, 0xb92f206a
+1,      20000,      20000,        0,       74, 0x1988222e
+0,      20854,      20854,     4171,      183, 0x921a5b3c
+1,      22000,      22000,        0,       74, 0x033b20dc
+1,      24000,      24000,        0,       74, 0xf8f41da4
+0,      25025,      25025,     4171,      181, 0xae765703
+1,      26000,      26000,        0,       74, 0xfc89201f
+1,      28000,      28000,        0,       74, 0x2b102428
+0,      29196,      29196,     4171,      181, 0xdc975d93
+1,      30000,      30000,        0,       74, 0x2df42380
+1,      32000,      32000,        0,       74, 0xebcf20fd
+0,      33367,      33367,     4171,      181, 0x30355b73
+1,      34000,      34000,        0,       74, 0x3eb524f8
+1,      36000,      36000,        0,       74, 0x1f802308
+0,      37538,      37538,     4171,      179, 0xef275e89
+1,      38000,      38000,        0,       74, 0x218d23bd
+1,      40000,      40000,        0,       74, 0x77f82421
+0,      41708,      41708,     4171,      181, 0xbdb35a1b
+1,      42000,      42000,        0,       74, 0xf20023a3
+1,      44000,      44000,        0,       74, 0x82cc1f9a
+0,      45879,      45879,     4171,      179, 0x1b245f55
+1,      46000,      46000,        0,       74, 0x8d3222e4
+1,      48000,      48000,        0,       74, 0x939d1e4c
+1,      50000,      50000,        0,       74, 0x55c3232c
+0,      50050,      50050,     4171,      181, 0x30355b73
+1,      52000,      52000,        0,       74, 0x85e02092
+1,      54000,      54000,        0,       74, 0xb9d02059
+0,      54221,      54221,     4171,      179, 0xef275e89
+1,      56000,      56000,        0,       74, 0xbbd8211f
+1,      58000,      58000,        0,       74, 0xe0ca20e1
+0,      58392,      58392,     4171,      181, 0xbdb35a1b
+1,      60000,      60000,        0,       74, 0xd4f9216b
+1,      62000,      62000,        0,       74, 0xdea723f9
+0,      62563,      62563,     4171,      179, 0x1b245f55
+1,      64000,      64000,        0,       74, 0xc2611fe9
+1,      66000,      66000,        0,       74, 0x9f941f2d
+0,      66733,      66733,     4171,      181, 0x30355b73
+1,      68000,      68000,        0,       74, 0xaf991eb9
+1,      70000,      70000,        0,       74, 0x7e79250e
+0,      70904,      70904,     4171,      179, 0xef275e89
+1,      72000,      72000,        0,       74, 0x5a421faa
+1,      74000,      74000,        0,       74, 0x3b211ce0
+0,      75075,      75075,     4171,      181, 0xbdb35a1b
+1,      76000,      76000,        0,       74, 0x4a812478
+1,      78000,      78000,        0,       74, 0xfc1b234f
+0,      79246,      79246,     4171,      179, 0x1b245f55
+1,      80000,      80000,        0,       74, 0x3d561db1
+1,      82000,      82000,        0,       74, 0x6bbb2475
+0,      83417,      83417,     4171,      181, 0x30355b73
+1,      84000,      84000,        0,       74, 0x76fe1f63
+1,      86000,      86000,        0,       74, 0x15861cf1
+0,      87588,      87588,     4171,      179, 0xef275e89
+1,      88000,      88000,        0,       74, 0x7dca1c6a
+1,      90000,      90000,        0,       74, 0xad8b20aa
+0,      91758,      91758,     4171,      181, 0xbdb35a1b
+1,      92000,      92000,        0,       74, 0x6ba01e89
+1,      94000,      94000,        0,       74, 0x621421eb
+0,      95929,      95929,     4171,      179, 0x1b245f55
+1,      96000,      96000,        0,       74, 0x26672424
+1,      98000,      98000,        0,       74, 0xcb6120f4
diff --git a/tests/ref/fate/matroska-ogg-opus-remux b/tests/ref/fate/matroska-ogg-opus-remux
index 600083c134..0d57c61ad7 100644
--- a/tests/ref/fate/matroska-ogg-opus-remux
+++ b/tests/ref/fate/matroska-ogg-opus-remux
@@ -1,63 +1,63 @@
-c8596f7b31a8b6693f53759942c3754f *tests/data/fate/matroska-ogg-opus-remux.matroska
-10206 tests/data/fate/matroska-ogg-opus-remux.matroska
+e088e75bcfdee2aa6da4db0a92bb541e *tests/data/fate/matroska-ogg-opus-remux.matroska
+10274 tests/data/fate/matroska-ogg-opus-remux.matroska
 #extradata 0:       19, 0x399c0471
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: opus
 #sample_rate 0: 48000
 #channel_layout_name 0: stereo
-0,         -7,         -7,       20,      402, 0x89b1c40f, S=1, Skip Samples,       10, 0x03f10065
-0,         13,         13,       20,      216, 0x7bf97146
-0,         33,         33,       20,      215, 0x6cb86d8b
-0,         53,         53,       20,      218, 0x9cfd691c
-0,         73,         73,       20,      218, 0xd7fe6a94
-0,         93,         93,       20,      194, 0x35735de6
-0,        113,        113,       20,      216, 0x3ee6705a
-0,        133,        133,       20,      218, 0x67eb6cb1
-0,        153,        153,       20,      218, 0x32d0700d
-0,        173,        173,       20,      219, 0xcb7f6c60
-0,        193,        193,       20,      218, 0x9c866b33
-0,        213,        213,       20,      217, 0xfe3e6a53
-0,        233,        233,       20,      218, 0x13586833
-0,        253,        253,       20,      222, 0xbcb2669e
-0,        273,        273,       20,      218, 0x8dfc6e33
-0,        293,        293,       20,      217, 0xf5957051
-0,        313,        313,       20,      210, 0xed126e6b
-0,        333,        333,       20,      216, 0xbf947249
-0,        353,        353,       20,      203, 0x6c7e680a
-0,        373,        373,       20,      209, 0xf78f6af4
-0,        393,        393,       20,      217, 0xd60c684d
-0,        413,        413,       20,      218, 0x89056a7a
-0,        433,        433,       20,      219, 0x0bc674ad
-0,        453,        453,       20,      217, 0xb1d86d1a
-0,        473,        473,       20,      220, 0x433d685a
-0,        493,        493,       20,      364, 0x0c88be84
-0,        513,        513,       20,      221, 0x804a733d
-0,        533,        533,       20,      215, 0x6e9d6e9b
-0,        553,        553,       20,      215, 0x63016a83
-0,        573,        573,       20,      218, 0xf9a46fbe
-0,        593,        593,       20,      216, 0xa0d66c08
-0,        613,        613,       20,      216, 0xa2ca6d0a
-0,        633,        633,       20,      216, 0xf50e6f1d
-0,        653,        653,       20,      215, 0x6aaa70b6
-0,        673,        673,       20,      219, 0x7ceb6ba0
-0,        693,        693,       20,      220, 0x398d6ca9
-0,        713,        713,       20,      218, 0x7bd06ed5
-0,        733,        733,       20,      219, 0xe2906c62
-0,        753,        753,       20,      217, 0xcf316ba1
-0,        773,        773,       20,      217, 0x470b6eea
-0,        793,        793,        7,      359, 0x36c2a18a, S=1, Skip Samples,       10, 0x0232005e
+0,       -742,       -742,     2000,      402, 0x89b1c40f, S=1, Skip Samples,       10, 0x03f10065
+0,       1258,       1258,     2000,      216, 0x7bf97146
+0,       3258,       3258,     2000,      215, 0x6cb86d8b
+0,       5258,       5258,     2000,      218, 0x9cfd691c
+0,       7258,       7258,     2000,      218, 0xd7fe6a94
+0,       9258,       9258,     2000,      194, 0x35735de6
+0,      11258,      11258,     2000,      216, 0x3ee6705a
+0,      13258,      13258,     2000,      218, 0x67eb6cb1
+0,      15258,      15258,     2000,      218, 0x32d0700d
+0,      17258,      17258,     2000,      219, 0xcb7f6c60
+0,      19258,      19258,     2000,      218, 0x9c866b33
+0,      21258,      21258,     2000,      217, 0xfe3e6a53
+0,      23258,      23258,     2000,      218, 0x13586833
+0,      25258,      25258,     2000,      222, 0xbcb2669e
+0,      27258,      27258,     2000,      218, 0x8dfc6e33
+0,      29258,      29258,     2000,      217, 0xf5957051
+0,      31258,      31258,     2000,      210, 0xed126e6b
+0,      33258,      33258,     2000,      216, 0xbf947249
+0,      35258,      35258,     2000,      203, 0x6c7e680a
+0,      37258,      37258,     2000,      209, 0xf78f6af4
+0,      39258,      39258,     2000,      217, 0xd60c684d
+0,      41258,      41258,     2000,      218, 0x89056a7a
+0,      43258,      43258,     2000,      219, 0x0bc674ad
+0,      45258,      45258,     2000,      217, 0xb1d86d1a
+0,      47258,      47258,     2000,      220, 0x433d685a
+0,      49258,      49258,     2000,      364, 0x0c88be84
+0,      51258,      51258,     2000,      221, 0x804a733d
+0,      53258,      53258,     2000,      215, 0x6e9d6e9b
+0,      55258,      55258,     2000,      215, 0x63016a83
+0,      57258,      57258,     2000,      218, 0xf9a46fbe
+0,      59258,      59258,     2000,      216, 0xa0d66c08
+0,      61258,      61258,     2000,      216, 0xa2ca6d0a
+0,      63258,      63258,     2000,      216, 0xf50e6f1d
+0,      65258,      65258,     2000,      215, 0x6aaa70b6
+0,      67258,      67258,     2000,      219, 0x7ceb6ba0
+0,      69258,      69258,     2000,      220, 0x398d6ca9
+0,      71258,      71258,     2000,      218, 0x7bd06ed5
+0,      73258,      73258,     2000,      219, 0xe2906c62
+0,      75258,      75258,     2000,      217, 0xcf316ba1
+0,      77258,      77258,     2000,      217, 0x470b6eea
+0,      79258,      79258,      742,      359, 0x36c2a18a, S=1, Skip Samples,       10, 0x0232005e
 [PACKET]
 codec_type=audio
 stream_index=0
-pts=-7
-pts_time=-0.007000
-dts=-7
-dts_time=-0.007000
-duration=20
+pts=-742
+pts_time=-0.007420
+dts=-742
+dts_time=-0.007420
+duration=2000
 duration_time=0.020000
 size=402
-pos=543
+pos=542
 flags=K__
 [SIDE_DATA]
 side_data_type=Skip Samples
@@ -70,27 +70,27 @@ discard_reason=0
 [PACKET]
 codec_type=audio
 stream_index=0
-pts=13
-pts_time=0.013000
-dts=13
-dts_time=0.013000
-duration=20
+pts=1258
+pts_time=0.012580
+dts=1258
+dts_time=0.012580
+duration=2000
 duration_time=0.020000
 size=216
-pos=952
+pos=951
 flags=K__
 [/PACKET]
 [PACKET]
 codec_type=audio
 stream_index=0
-pts=33
-pts_time=0.033000
-dts=33
-dts_time=0.033000
-duration=20
+pts=3258
+pts_time=0.032580
+dts=3258
+dts_time=0.032580
+duration=2000
 duration_time=0.020000
 size=215
-pos=1175
+pos=1174
 flags=K__
 [/PACKET]
 [STREAM]
diff --git a/tests/ref/fate/matroska-opus-best-fit-ts-remux b/tests/ref/fate/matroska-opus-best-fit-ts-remux
index c310fc52df..423708df2f 100644
--- a/tests/ref/fate/matroska-opus-best-fit-ts-remux
+++ b/tests/ref/fate/matroska-opus-best-fit-ts-remux
@@ -1,60 +1,60 @@
-b9881205f8945fefc16a6f23474071a6 *tests/data/fate/matroska-opus-best-fit-ts-remux.matroska
-9358 tests/data/fate/matroska-opus-best-fit-ts-remux.matroska
+f328d1b7a0bebdecbcfab9b605c8c760 *tests/data/fate/matroska-opus-best-fit-ts-remux.matroska
+9461 tests/data/fate/matroska-opus-best-fit-ts-remux.matroska
 #extradata 0:       19, 0x3a04048f
-#tb 0: 1/1000
+#tb 0: 1/100000
 #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,       -650,       -650,     2000,      320, 0x58b9a88d, S=1, Skip Samples,       10, 0x02390039
+0,       1350,       1350,     2000,      159, 0x6c9c4b4c
+0,       3350,       3350,     2000,      148, 0x0caf4b5d
+0,       5350,       5350,     2000,      139, 0xc5624226
+0,       7350,       7350,     2000,      146, 0x633c4937
+0,       9350,       9350,     2000,      153, 0x3d0b4f93
+0,      11350,      11350,     2000,      158, 0xe5c55641
+0,      13350,      13350,     2000,      156, 0xf2fd50ef
+0,      15350,      15350,     2000,      158, 0x93b15410
+0,      17350,      17350,     2000,      157, 0xb6f74f5f
+0,      19350,      19350,     2000,      159, 0x9aff4957
+0,      21350,      21350,     2000,      153, 0xfc5f4aba
+0,      23350,      23350,     2000,      158, 0x01e44f70
+0,      25350,      25350,     2000,      153, 0x227149cf
+0,      27350,      27350,     2000,      155, 0x312f4cf6
+0,      29350,      29350,     2000,      155, 0xafc54bae
+0,      31350,      31350,     2000,      151, 0x7b4252b3
+0,      33350,      33350,     2000,      155, 0x29074a75
+0,      35350,      35350,     2000,      149, 0x82c44bcd
+0,      37350,      37350,     2000,      150, 0x55c24eb5
+0,      39350,      39350,     2000,      156, 0xf71d4f33
+0,      41350,      41350,     2000,      153, 0x9b6c4ae5
+0,      43350,      43350,     2000,      156, 0x75954e51
+0,      45350,      45350,     2000,      155, 0x28ff4ff3
+0,      47350,      47350,     2000,      153, 0xc4424969
+0,      49350,      49350,     2000,      154, 0xfbf94cc8
+0,      51350,      51350,     2000,      155, 0x52c549af
+0,      53350,      53350,     2000,      150, 0x6f1e4b7a
+0,      55350,      55350,     2000,      158, 0xabb45566
+0,      57350,      57350,     2000,      157, 0xe61d4a99
+0,      59350,      59350,     2000,      159, 0xf45d4fac
+0,      61350,      61350,     2000,      159, 0xcd0553a5
+0,      63350,      63350,     2000,      156, 0xdb244e63
+0,      65350,      65350,     2000,      154, 0x78654c52
+0,      67350,      67350,     2000,      154, 0x9f804cc8
+0,      69350,      69350,     2000,      150, 0x1fdf4c80
+0,      71350,      71350,     2000,      155, 0x1adc4f89
+0,      73350,      73350,     2000,      155, 0x4b53511c
+0,      75350,      75350,     2000,      151, 0x8ff2546d
+0,      77350,      77350,     2000,      158, 0xb7e34f1b
+0,      79350,      79350,     2000,      154, 0x4d98474b
+0,      81350,      81350,     2000,      154, 0x14924ea8
+0,      83350,      83350,     2000,      153, 0x8d4752bf
+0,      85350,      85350,     2000,      149, 0x74785066
+0,      87350,      87350,     2000,      151, 0x36c94a4c
+0,      89350,      89350,     2000,      155, 0x82904f3b
+0,      91350,      91350,     2000,      154, 0xd76b4a45
+0,      93350,      93350,     2000,      159, 0x9fec548d
+0,      95350,      95350,     2000,      154, 0x9a084dcd
+0,      97350,      97350,     2000,      155, 0x90a54ac8
+0,      99350,      99350,     2000,      324, 0x8e34a2f5
+0,     101350,     101350,     2000,      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 059e7f5662..3da9b0a97f 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
+3c6885487ff810eee17ad1fa2a7cdf98 *tests/data/fate/matroska-opus-best-fit-ts-sample-gap.matroska
+9461 tests/data/fate/matroska-opus-best-fit-ts-sample-gap.matroska
 #extradata 0:       19, 0x3a04048f
-#tb 0: 1/48000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: opus
 #sample_rate 0: 48000
 #channel_layout_name 0: mono
-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
+0,       -650,       -650,     2000,      320, 0x58b9a88d, S=1, Skip Samples,       10, 0x02390039
+0,       1352,       1352,     2000,      159, 0x6c9c4b4c
+0,       3352,       3352,     2000,      148, 0x0caf4b5d
+0,       5352,       5352,     2000,      139, 0xc5624226
+0,       7352,       7352,     2000,      146, 0x633c4937
+0,       9352,       9352,     2000,      153, 0x3d0b4f93
+0,      11352,      11352,     2000,      158, 0xe5c55641
+0,      13352,      13352,     2000,      156, 0xf2fd50ef
+0,      15352,      15352,     2000,      158, 0x93b15410
+0,      17352,      17352,     2000,      157, 0xb6f74f5f
+0,      19352,      19352,     2000,      159, 0x9aff4957
+0,      21352,      21352,     2000,      153, 0xfc5f4aba
+0,      23352,      23352,     2000,      158, 0x01e44f70
+0,      25352,      25352,     2000,      153, 0x227149cf
+0,      27352,      27352,     2000,      155, 0x312f4cf6
+0,      29352,      29352,     2000,      155, 0xafc54bae
+0,      31352,      31352,     2000,      151, 0x7b4252b3
+0,      33352,      33352,     2000,      155, 0x29074a75
+0,      35352,      35352,     2000,      149, 0x82c44bcd
+0,      37352,      37352,     2000,      150, 0x55c24eb5
+0,      39352,      39352,     2000,      156, 0xf71d4f33
+0,      41352,      41352,     2000,      153, 0x9b6c4ae5
+0,      43352,      43352,     2000,      156, 0x75954e51
+0,      45352,      45352,     2000,      155, 0x28ff4ff3
+0,      47352,      47352,     2000,      153, 0xc4424969
+0,      49352,      49352,     2000,      154, 0xfbf94cc8
+0,      51352,      51352,     2000,      155, 0x52c549af
+0,      53352,      53352,     2000,      150, 0x6f1e4b7a
+0,      55352,      55352,     2000,      158, 0xabb45566
+0,      57352,      57352,     2000,      157, 0xe61d4a99
+0,      59352,      59352,     2000,      159, 0xf45d4fac
+0,      61352,      61352,     2000,      159, 0xcd0553a5
+0,      63352,      63352,     2000,      156, 0xdb244e63
+0,      65352,      65352,     2000,      154, 0x78654c52
+0,      67352,      67352,     2000,      154, 0x9f804cc8
+0,      69352,      69352,     2000,      150, 0x1fdf4c80
+0,      71352,      71352,     2000,      155, 0x1adc4f89
+0,      73352,      73352,     2000,      155, 0x4b53511c
+0,      75352,      75352,     2000,      151, 0x8ff2546d
+0,      77352,      77352,     2000,      158, 0xb7e34f1b
+0,      79352,      79352,     2000,      154, 0x4d98474b
+0,      81352,      81352,     2000,      154, 0x14924ea8
+0,      83352,      83352,     2000,      153, 0x8d4752bf
+0,      85352,      85352,     2000,      149, 0x74785066
+0,      87352,      87352,     2000,      151, 0x36c94a4c
+0,      89352,      89352,     2000,      155, 0x82904f3b
+0,      91352,      91352,     2000,      154, 0xd76b4a45
+0,      93352,      93352,     2000,      159, 0x9fec548d
+0,      95352,      95352,     2000,      154, 0x9a084dcd
+0,      97352,      97352,     2000,      155, 0x90a54ac8
+0,      99352,      99352,     2000,      324, 0x8e34a2f5
+0,     101352,     101352,     2000,      268, 0x10f37203, S=1, Skip Samples,       10, 0x049600c4
diff --git a/tests/ref/fate/matroska-opus-remux b/tests/ref/fate/matroska-opus-remux
index 9af4250034..e81419ae17 100644
--- a/tests/ref/fate/matroska-opus-remux
+++ b/tests/ref/fate/matroska-opus-remux
@@ -1,74 +1,74 @@
-b9881205f8945fefc16a6f23474071a6 *tests/data/fate/matroska-opus-remux.matroska
-9358 tests/data/fate/matroska-opus-remux.matroska
+36f26bc9c8e87d6f874d066bf8f69c58 *tests/data/fate/matroska-opus-remux.matroska
+9461 tests/data/fate/matroska-opus-remux.matroska
 #extradata 0:       19, 0x3a04048f
-#tb 0: 1/1000
+#tb 0: 1/100000
 #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,       -650,       -650,     2000,      320, 0x58b9a88d, S=1, Skip Samples,       10, 0x02390039
+0,       1450,       1450,     2000,      159, 0x6c9c4b4c
+0,       3450,       3450,     2000,      148, 0x0caf4b5d
+0,       5450,       5450,     2000,      139, 0xc5624226
+0,       7450,       7450,     2000,      146, 0x633c4937
+0,       9450,       9450,     2000,      153, 0x3d0b4f93
+0,      11450,      11450,     2000,      158, 0xe5c55641
+0,      13450,      13450,     2000,      156, 0xf2fd50ef
+0,      15450,      15450,     2000,      158, 0x93b15410
+0,      17450,      17450,     2000,      157, 0xb6f74f5f
+0,      19450,      19450,     2000,      159, 0x9aff4957
+0,      21450,      21450,     2000,      153, 0xfc5f4aba
+0,      23450,      23450,     2000,      158, 0x01e44f70
+0,      25450,      25450,     2000,      153, 0x227149cf
+0,      27450,      27450,     2000,      155, 0x312f4cf6
+0,      29450,      29450,     2000,      155, 0xafc54bae
+0,      31450,      31450,     2000,      151, 0x7b4252b3
+0,      33450,      33450,     2000,      155, 0x29074a75
+0,      35450,      35450,     2000,      149, 0x82c44bcd
+0,      37450,      37450,     2000,      150, 0x55c24eb5
+0,      39450,      39450,     2000,      156, 0xf71d4f33
+0,      41450,      41450,     2000,      153, 0x9b6c4ae5
+0,      43450,      43450,     2000,      156, 0x75954e51
+0,      45450,      45450,     2000,      155, 0x28ff4ff3
+0,      47450,      47450,     2000,      153, 0xc4424969
+0,      49450,      49450,     2000,      154, 0xfbf94cc8
+0,      51450,      51450,     2000,      155, 0x52c549af
+0,      53450,      53450,     2000,      150, 0x6f1e4b7a
+0,      55450,      55450,     2000,      158, 0xabb45566
+0,      57450,      57450,     2000,      157, 0xe61d4a99
+0,      59450,      59450,     2000,      159, 0xf45d4fac
+0,      61450,      61450,     2000,      159, 0xcd0553a5
+0,      63450,      63450,     2000,      156, 0xdb244e63
+0,      65450,      65450,     2000,      154, 0x78654c52
+0,      67450,      67450,     2000,      154, 0x9f804cc8
+0,      69450,      69450,     2000,      150, 0x1fdf4c80
+0,      71450,      71450,     2000,      155, 0x1adc4f89
+0,      73450,      73450,     2000,      155, 0x4b53511c
+0,      75450,      75450,     2000,      151, 0x8ff2546d
+0,      77450,      77450,     2000,      158, 0xb7e34f1b
+0,      79450,      79450,     2000,      154, 0x4d98474b
+0,      81450,      81450,     2000,      154, 0x14924ea8
+0,      83450,      83450,     2000,      153, 0x8d4752bf
+0,      85450,      85450,     2000,      149, 0x74785066
+0,      87450,      87450,     2000,      151, 0x36c94a4c
+0,      89450,      89450,     2000,      155, 0x82904f3b
+0,      91450,      91450,     2000,      154, 0xd76b4a45
+0,      93450,      93450,     2000,      159, 0x9fec548d
+0,      95450,      95450,     2000,      154, 0x9a084dcd
+0,      97450,      97450,     2000,      155, 0x90a54ac8
+0,      99450,      99450,     2000,      324, 0x8e34a2f5
+0,     101450,     101450,     2000,      268, 0x10f37203, S=1, Skip Samples,       10, 0x049600c4
 [PACKET]
 codec_type=audio
 stream_index=0
-pts=-7
-pts_time=-0.007000
-dts=-7
-dts_time=-0.007000
-duration=20
+pts=-650
+pts_time=-0.006500
+dts=-650
+dts_time=-0.006500
+duration=2000
 duration_time=0.020000
 size=320
-pos=499
+pos=498
 flags=K__
 [SIDE_DATA]
 side_data_type=Skip Samples
@@ -81,27 +81,27 @@ discard_reason=0
 [PACKET]
 codec_type=audio
 stream_index=0
-pts=14
-pts_time=0.014000
-dts=14
-dts_time=0.014000
-duration=20
+pts=1450
+pts_time=0.014500
+dts=1450
+dts_time=0.014500
+duration=2000
 duration_time=0.020000
 size=159
-pos=826
+pos=825
 flags=K__
 [/PACKET]
 [PACKET]
 codec_type=audio
 stream_index=0
-pts=34
-pts_time=0.034000
-dts=34
-dts_time=0.034000
-duration=20
+pts=3450
+pts_time=0.034500
+dts=3450
+dts_time=0.034500
+duration=2000
 duration_time=0.020000
 size=148
-pos=992
+pos=991
 flags=K__
 [/PACKET]
 [STREAM]
diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode
index b92963f9dc..be4b8e0931 100644
--- a/tests/ref/fate/matroska-qt-mode
+++ b/tests/ref/fate/matroska-qt-mode
@@ -1,124 +1,124 @@
-bab6f4122a60a0d4e192fb93c17a5464 *tests/data/fate/matroska-qt-mode.matroska
-1884240 tests/data/fate/matroska-qt-mode.matroska
+d9e3184ca69eae61bdb1c7841b19a6d0 *tests/data/fate/matroska-qt-mode.matroska
+1885361 tests/data/fate/matroska-qt-mode.matroska
 #extradata 0:       90, 0x817d0185
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: video
 #codec_id 0: svq1
 #dimensions 0: 160x120
 #sar 0: 0/1
-#tb 1: 1/1000
+#tb 1: 1/100000
 #media_type 1: audio
 #codec_id 1: pcm_u8
 #sample_rate 1: 22050
 #channel_layout_name 1: mono
-0,          0,          0,       67,     3340, 0xcdb26464
-1,          0,          0,       46,     1024, 0x3c0f001e
-1,         46,         46,       46,     1024, 0x5772fef7
-0,         67,         67,       67,       76, 0xc93b1f74, F=0x0
-1,         93,         93,       46,     1024, 0xa98efec4
-0,        133,        133,       67,      116, 0x5688353c, F=0x0
-1,        139,        139,       46,     1024, 0xba56fd5d
-1,        186,        186,       46,     1024, 0x69d7063c
-0,        200,        200,       67,      112, 0xbe8f3086, F=0x0
-1,        232,        232,       46,     1024, 0x2b67fc5a
-0,        267,        267,       67,      132, 0xd0cd3b9c, F=0x0
-1,        279,        279,       46,     1024, 0xcdf9022d
-1,        325,        325,       46,     1024, 0x91f6fd81
-0,        333,        333,       67,      200, 0x42385725, F=0x0
-1,        372,        372,       46,     1024, 0x920eff99
-0,        400,        400,       67,      164, 0x2d344be3, F=0x0
-1,        418,        418,       46,     1024, 0x09a2ff2b
-1,        464,        464,       35,      785, 0x6ece8797
-0,        467,        467,       67,      176, 0xc97c53ff, F=0x0
-1,        500,        500,       46,     1024, 0x9a50fc54
-0,        533,        533,       67,      216, 0x62fe5cf9, F=0x0
-1,        546,        546,       46,     1024, 0xc5ef006e
-1,        593,        593,       46,     1024, 0x53430734
-0,        600,        600,       67,      164, 0x52564b48, F=0x0
-1,        639,        639,       46,     1024, 0xaaaff2dc
-0,        667,        667,       67,      244, 0x25e16dfb, F=0x0
-1,        686,        686,       46,     1024, 0xe29a01d2
-1,        732,        732,       46,     1024, 0x4deb0411
-0,        733,        733,       67,      156, 0x6abe49bf, F=0x0
-1,        779,        779,       46,     1024, 0x4f5dfd8d
-0,        800,        800,       67,      152, 0x47f84373, F=0x0
-1,        825,        825,       46,     1024, 0x4dc5fdf1
-0,        867,        867,       67,      144, 0xe0c64013, F=0x0
-1,        872,        872,       46,     1024, 0x7e0dff54
-1,        918,        918,       46,     1024, 0xde9cff3e
-0,        933,        933,       67,      280, 0xa3b57919, F=0x0
-1,        964,        964,       35,      785, 0xfdb78def
-0,       1000,       1000,       67,     3312, 0x45ee5b17
-1,       1000,       1000,       46,     1024, 0x5224f542
-1,       1046,       1046,       46,     1024, 0x6e61f9bc
-0,       1067,       1067,       67,      324, 0x07cd8cd2, F=0x0
-1,       1093,       1093,       46,     1024, 0x5727115f
-0,       1133,       1133,       67,      364, 0x101d9883, F=0x0
-1,       1139,       1139,       46,     1024, 0x1b70eccb
-1,       1186,       1186,       46,     1024, 0x717f0778
-0,       1200,       1200,       67,      440, 0x4628b544, F=0x0
-1,       1232,       1232,       46,     1024, 0xf1870091
-0,       1267,       1267,       67,     7020, 0x0a137edf
-1,       1279,       1279,       46,     1024, 0xca1df3a7
-1,       1325,       1325,       46,     1024, 0x5a921497
-0,       1333,       1333,       67,     5768, 0xc019d7b8, F=0x0
-1,       1372,       1372,       46,     1024, 0x0655e7bf
-0,       1400,       1400,       67,     4820, 0xcc946718, F=0x0
-1,       1418,       1418,       46,     1024, 0x2a8a141c
-1,       1464,       1464,       35,      785, 0xbd3a81a5
-0,       1467,       1467,       67,     6112, 0xbaf23f70, F=0x0
-1,       1500,       1500,       46,     1024, 0x54b5fc77
-0,       1533,       1533,       67,     6112, 0xc79655d0, F=0x0
-1,       1546,       1546,       46,     1024, 0x8febfbc1
-1,       1593,       1593,       46,     1024, 0x8ef8f1c1
-0,       1600,       1600,       67,     5112, 0x1d8fe26b, F=0x0
-1,       1639,       1639,       46,     1024, 0x565817aa
-0,       1667,       1667,       67,     5872, 0x162eed4d, F=0x0
-1,       1686,       1686,       46,     1024, 0xfdd7ef74
-1,       1732,       1732,       46,     1024, 0x69080694
-0,       1733,       1733,       67,     5092, 0x6ce7e2aa, F=0x0
-1,       1779,       1779,       46,     1024, 0xe4a105c3
-0,       1800,       1800,       67,     5648, 0xfa739b01, F=0x0
-1,       1825,       1825,       46,     1024, 0x1397f5e1
-0,       1867,       1867,       67,     5516, 0x8a778b2b, F=0x0
-1,       1872,       1872,       46,     1024, 0xb298fc7a
-1,       1918,       1918,       46,     1024, 0x2869030a
-0,       1933,       1933,       67,     5088, 0xdd60e51e, F=0x0
-1,       1964,       1964,       35,      785, 0xf6a49164
-0,       2000,       2000,       67,     5808, 0x14b6e8b3, F=0x0
-1,       2000,       2000,       46,     1024, 0x668ce4db
-1,       2046,       2046,       46,     1024, 0x08c71cd7
-0,       2067,       2067,       67,     4512, 0x9efdf756, F=0x0
-1,       2093,       2093,       46,     1024, 0xc682e3f3
-0,       2133,       2133,       67,     5404, 0x50ce47a2, F=0x0
-1,       2139,       2139,       46,     1024, 0x98bc11c5
-1,       2186,       2186,       46,     1024, 0x4a6ef47d
-0,       2200,       2200,       67,     5732, 0x7b46abbf, F=0x0
-1,       2232,       2232,       46,     1024, 0xa6660535
-0,       2267,       2267,       67,     6936, 0x325421f1
-1,       2279,       2279,       46,     1024, 0xa1d1fd9d
-1,       2325,       2325,       46,     1024, 0xf012fbf3
-0,       2333,       2333,       67,     5780, 0x8eb1d896, F=0x0
-1,       2372,       2372,       46,     1024, 0xacc00616
-0,       2400,       2400,       67,     2280, 0x3a778e69
-1,       2418,       2418,       46,     1024, 0xc8660aac
-1,       2464,       2464,       35,      785, 0xe9416835
-0,       2467,       2467,       67,     1220, 0x676b10f0, F=0x0
-1,       2500,       2500,       46,     1024, 0xe31622b5
-0,       2533,       2533,       67,     1584, 0x668b6e9e, F=0x0
-1,       2546,       2546,       46,     1024, 0xc53ee0b8
-1,       2593,       2593,       46,     1024, 0xf26d1102
-0,       2600,       2600,       67,     1084, 0xbdf4ca3d, F=0x0
-1,       2639,       2639,       46,     1024, 0xd2fffa3d
-0,       2667,       2667,       67,     1612, 0xd9f3817a, F=0x0
-1,       2686,       2686,       46,     1024, 0x584f0189
-1,       2732,       2732,       46,     1024, 0xb765fce5
-0,       2733,       2733,       67,     1696, 0x91ceac8b, F=0x0
-1,       2779,       2779,       46,     1024, 0x570dfe8b
-0,       2800,       2800,       67,     1532, 0x0b2a7bf1, F=0x0
-1,       2825,       2825,       46,     1024, 0x2aa7ff16
-0,       2867,       2867,       67,     2072, 0x3daf2859, F=0x0
-1,       2872,       2872,       46,     1024, 0x5174fe72
-1,       2918,       2918,       46,     1024, 0x21b302d0
-0,       2933,       2933,       67,     1568, 0xbd4d7e64, F=0x0
-1,       2964,       2964,       35,      785, 0x88b67dcd
+0,          0,          0,     6667,     3340, 0xcdb26464
+1,          0,          0,     4643,     1024, 0x3c0f001e
+1,       4644,       4644,     4643,     1024, 0x5772fef7
+0,       6667,       6667,     6667,       76, 0xc93b1f74, F=0x0
+1,       9288,       9288,     4643,     1024, 0xa98efec4
+0,      13333,      13333,     6667,      116, 0x5688353c, F=0x0
+1,      13932,      13932,     4643,     1024, 0xba56fd5d
+1,      18576,      18576,     4643,     1024, 0x69d7063c
+0,      20000,      20000,     6667,      112, 0xbe8f3086, F=0x0
+1,      23220,      23220,     4643,     1024, 0x2b67fc5a
+0,      26667,      26667,     6667,      132, 0xd0cd3b9c, F=0x0
+1,      27864,      27864,     4643,     1024, 0xcdf9022d
+1,      32508,      32508,     4643,     1024, 0x91f6fd81
+0,      33333,      33333,     6667,      200, 0x42385725, F=0x0
+1,      37152,      37152,     4643,     1024, 0x920eff99
+0,      40000,      40000,     6667,      164, 0x2d344be3, F=0x0
+1,      41796,      41796,     4643,     1024, 0x09a2ff2b
+1,      46440,      46440,     3560,      785, 0x6ece8797
+0,      46667,      46667,     6667,      176, 0xc97c53ff, F=0x0
+1,      50000,      50000,     4643,     1024, 0x9a50fc54
+0,      53333,      53333,     6667,      216, 0x62fe5cf9, F=0x0
+1,      54644,      54644,     4643,     1024, 0xc5ef006e
+1,      59288,      59288,     4643,     1024, 0x53430734
+0,      60000,      60000,     6667,      164, 0x52564b48, F=0x0
+1,      63932,      63932,     4643,     1024, 0xaaaff2dc
+0,      66667,      66667,     6667,      244, 0x25e16dfb, F=0x0
+1,      68576,      68576,     4643,     1024, 0xe29a01d2
+1,      73220,      73220,     4643,     1024, 0x4deb0411
+0,      73333,      73333,     6667,      156, 0x6abe49bf, F=0x0
+1,      77864,      77864,     4643,     1024, 0x4f5dfd8d
+0,      80000,      80000,     6667,      152, 0x47f84373, F=0x0
+1,      82508,      82508,     4643,     1024, 0x4dc5fdf1
+0,      86667,      86667,     6667,      144, 0xe0c64013, F=0x0
+1,      87152,      87152,     4643,     1024, 0x7e0dff54
+1,      91796,      91796,     4643,     1024, 0xde9cff3e
+0,      93333,      93333,     6667,      280, 0xa3b57919, F=0x0
+1,      96440,      96440,     3560,      785, 0xfdb78def
+0,     100000,     100000,     6667,     3312, 0x45ee5b17
+1,     100000,     100000,     4643,     1024, 0x5224f542
+1,     104644,     104644,     4643,     1024, 0x6e61f9bc
+0,     106667,     106667,     6667,      324, 0x07cd8cd2, F=0x0
+1,     109288,     109288,     4643,     1024, 0x5727115f
+0,     113333,     113333,     6667,      364, 0x101d9883, F=0x0
+1,     113932,     113932,     4643,     1024, 0x1b70eccb
+1,     118576,     118576,     4643,     1024, 0x717f0778
+0,     120000,     120000,     6667,      440, 0x4628b544, F=0x0
+1,     123220,     123220,     4643,     1024, 0xf1870091
+0,     126667,     126667,     6667,     7020, 0x0a137edf
+1,     127864,     127864,     4643,     1024, 0xca1df3a7
+1,     132508,     132508,     4643,     1024, 0x5a921497
+0,     133333,     133333,     6667,     5768, 0xc019d7b8, F=0x0
+1,     137152,     137152,     4643,     1024, 0x0655e7bf
+0,     140000,     140000,     6667,     4820, 0xcc946718, F=0x0
+1,     141796,     141796,     4643,     1024, 0x2a8a141c
+1,     146440,     146440,     3560,      785, 0xbd3a81a5
+0,     146667,     146667,     6667,     6112, 0xbaf23f70, F=0x0
+1,     150000,     150000,     4643,     1024, 0x54b5fc77
+0,     153333,     153333,     6667,     6112, 0xc79655d0, F=0x0
+1,     154644,     154644,     4643,     1024, 0x8febfbc1
+1,     159288,     159288,     4643,     1024, 0x8ef8f1c1
+0,     160000,     160000,     6667,     5112, 0x1d8fe26b, F=0x0
+1,     163932,     163932,     4643,     1024, 0x565817aa
+0,     166667,     166667,     6667,     5872, 0x162eed4d, F=0x0
+1,     168576,     168576,     4643,     1024, 0xfdd7ef74
+1,     173220,     173220,     4643,     1024, 0x69080694
+0,     173333,     173333,     6667,     5092, 0x6ce7e2aa, F=0x0
+1,     177864,     177864,     4643,     1024, 0xe4a105c3
+0,     180000,     180000,     6667,     5648, 0xfa739b01, F=0x0
+1,     182508,     182508,     4643,     1024, 0x1397f5e1
+0,     186667,     186667,     6667,     5516, 0x8a778b2b, F=0x0
+1,     187152,     187152,     4643,     1024, 0xb298fc7a
+1,     191796,     191796,     4643,     1024, 0x2869030a
+0,     193333,     193333,     6667,     5088, 0xdd60e51e, F=0x0
+1,     196440,     196440,     3560,      785, 0xf6a49164
+0,     200000,     200000,     6667,     5808, 0x14b6e8b3, F=0x0
+1,     200000,     200000,     4643,     1024, 0x668ce4db
+1,     204644,     204644,     4643,     1024, 0x08c71cd7
+0,     206667,     206667,     6667,     4512, 0x9efdf756, F=0x0
+1,     209288,     209288,     4643,     1024, 0xc682e3f3
+0,     213333,     213333,     6667,     5404, 0x50ce47a2, F=0x0
+1,     213932,     213932,     4643,     1024, 0x98bc11c5
+1,     218576,     218576,     4643,     1024, 0x4a6ef47d
+0,     220000,     220000,     6667,     5732, 0x7b46abbf, F=0x0
+1,     223220,     223220,     4643,     1024, 0xa6660535
+0,     226667,     226667,     6667,     6936, 0x325421f1
+1,     227864,     227864,     4643,     1024, 0xa1d1fd9d
+1,     232508,     232508,     4643,     1024, 0xf012fbf3
+0,     233333,     233333,     6667,     5780, 0x8eb1d896, F=0x0
+1,     237152,     237152,     4643,     1024, 0xacc00616
+0,     240000,     240000,     6667,     2280, 0x3a778e69
+1,     241796,     241796,     4643,     1024, 0xc8660aac
+1,     246440,     246440,     3560,      785, 0xe9416835
+0,     246667,     246667,     6667,     1220, 0x676b10f0, F=0x0
+1,     250000,     250000,     4643,     1024, 0xe31622b5
+0,     253333,     253333,     6667,     1584, 0x668b6e9e, F=0x0
+1,     254644,     254644,     4643,     1024, 0xc53ee0b8
+1,     259288,     259288,     4643,     1024, 0xf26d1102
+0,     260000,     260000,     6667,     1084, 0xbdf4ca3d, F=0x0
+1,     263932,     263932,     4643,     1024, 0xd2fffa3d
+0,     266667,     266667,     6667,     1612, 0xd9f3817a, F=0x0
+1,     268576,     268576,     4643,     1024, 0x584f0189
+1,     273220,     273220,     4643,     1024, 0xb765fce5
+0,     273333,     273333,     6667,     1696, 0x91ceac8b, F=0x0
+1,     277864,     277864,     4643,     1024, 0x570dfe8b
+0,     280000,     280000,     6667,     1532, 0x0b2a7bf1, F=0x0
+1,     282508,     282508,     4643,     1024, 0x2aa7ff16
+0,     286667,     286667,     6667,     2072, 0x3daf2859, F=0x0
+1,     287152,     287152,     4643,     1024, 0x5174fe72
+1,     291796,     291796,     4643,     1024, 0x21b302d0
+0,     293333,     293333,     6667,     1568, 0xbd4d7e64, F=0x0
+1,     296440,     296440,     3560,      785, 0x88b67dcd
diff --git a/tests/ref/fate/segment-adts-to-mkv b/tests/ref/fate/segment-adts-to-mkv
index 2c9d5e8b36..5934db0d1a 100644
--- a/tests/ref/fate/segment-adts-to-mkv
+++ b/tests/ref/fate/segment-adts-to-mkv
@@ -1,40 +1,40 @@
 #extradata 0:        2, 0x0030001c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
 #channel_layout_name 0: mono
-0,          0,          0,       64,        4, 0x02f70117, S=1, Skip Samples,       10, 0x02c80048
-0,         64,         64,       64,      163, 0xd5f85007
-0,        128,        128,       64,      127, 0x66484065
-0,        192,        192,       64,       94, 0x55222bd6
-0,        256,        256,       64,      314, 0x3c7e923a
-0,        320,        320,       64,      207, 0x1efc5d1b
-0,        384,        384,       64,      119, 0xb2a13601
-0,        448,        448,       64,      184, 0xcafc6091
-0,        512,        512,       64,      132, 0xddd33c0b
-0,        576,        576,       64,      152, 0x83935031
-0,        640,        640,       64,      227, 0x32a86bc4
-0,        704,        704,       64,      122, 0xd04e3571
-0,        768,        768,       64,      163, 0x57d44d16
-0,        832,        832,       64,      147, 0x226043d7
-0,        896,        896,       64,      119, 0x8ad931ed
-0,        960,        960,       64,      153, 0xbb6e432f
-0,       1024,       1024,       64,      185, 0xa01f4ff3
-0,       1088,       1088,       64,      126, 0x85503ce6
-0,       1152,       1152,       64,      246, 0x652c7b59
-0,       1216,       1216,       64,      162, 0xc9f04da0
-0,       1280,       1280,       64,      135, 0x71fa3be0
-0,       1344,       1344,       64,      246, 0x7a6f7788
-0,       1408,       1408,       64,      262, 0xd3097781
-0,       1472,       1472,       64,       60, 0x09a118f5
-0,       1536,       1536,       64,      255, 0xbab5793c
-0,       1600,       1600,       64,      153, 0x6b6a44fb
-0,       1664,       1664,       64,      160, 0x550e4530
-0,       1728,       1728,       64,      215, 0x7fe66144
-0,       1792,       1792,       64,      144, 0xcd723f7d
-0,       1856,       1856,       64,      187, 0x2a0b5c1b
-0,       1920,       1920,       64,      177, 0xb8c355d5
-0,       1984,       1984,       64,      156, 0x867d4f3a
-0,       2048,       2048,       64,      201, 0x62745ff9
-0,       2112,       2112,       64,      137, 0x90c639e0, S=1, Skip Samples,       10, 0x048a00c2
+0,          0,          0,     6400,        4, 0x02f70117, S=1, Skip Samples,       10, 0x02c80048
+0,       6400,       6400,     6400,      163, 0xd5f85007
+0,      12800,      12800,     6400,      127, 0x66484065
+0,      19200,      19200,     6400,       94, 0x55222bd6
+0,      25600,      25600,     6400,      314, 0x3c7e923a
+0,      32000,      32000,     6400,      207, 0x1efc5d1b
+0,      38400,      38400,     6400,      119, 0xb2a13601
+0,      44800,      44800,     6400,      184, 0xcafc6091
+0,      51200,      51200,     6400,      132, 0xddd33c0b
+0,      57600,      57600,     6400,      152, 0x83935031
+0,      64000,      64000,     6400,      227, 0x32a86bc4
+0,      70400,      70400,     6400,      122, 0xd04e3571
+0,      76800,      76800,     6400,      163, 0x57d44d16
+0,      83200,      83200,     6400,      147, 0x226043d7
+0,      89600,      89600,     6400,      119, 0x8ad931ed
+0,      96000,      96000,     6400,      153, 0xbb6e432f
+0,     102400,     102400,     6400,      185, 0xa01f4ff3
+0,     108800,     108800,     6400,      126, 0x85503ce6
+0,     115200,     115200,     6400,      246, 0x652c7b59
+0,     121600,     121600,     6400,      162, 0xc9f04da0
+0,     128000,     128000,     6400,      135, 0x71fa3be0
+0,     134400,     134400,     6400,      246, 0x7a6f7788
+0,     140800,     140800,     6400,      262, 0xd3097781
+0,     147200,     147200,     6400,       60, 0x09a118f5
+0,     153600,     153600,     6400,      255, 0xbab5793c
+0,     160000,     160000,     6400,      153, 0x6b6a44fb
+0,     166400,     166400,     6400,      160, 0x550e4530
+0,     172800,     172800,     6400,      215, 0x7fe66144
+0,     179200,     179200,     6400,      144, 0xcd723f7d
+0,     185600,     185600,     6400,      187, 0x2a0b5c1b
+0,     192000,     192000,     6400,      177, 0xb8c355d5
+0,     198400,     198400,     6400,      156, 0x867d4f3a
+0,     204800,     204800,     6400,      201, 0x62745ff9
+0,     211200,     211200,     6400,      137, 0x90c639e0, S=1, Skip Samples,       10, 0x048a00c2
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-000 b/tests/ref/fate/segment-adts-to-mkv-header-000
index d638b7fe5b..8fb5e6d0bb 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-000
+++ b/tests/ref/fate/segment-adts-to-mkv-header-000
@@ -1,21 +1,21 @@
 #extradata 0:        2, 0x0030001c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
 #channel_layout_name 0: mono
-0,       -132,       -132,       64,        4, 0x02f70117, S=1, Skip Samples,       10, 0x02c80048
-0,        -68,        -68,       64,      163, 0xd5f85007
-0,         -4,         -4,       64,      127, 0x66484065
-0,         60,         60,       64,       94, 0x55222bd6
-0,        124,        124,       64,      314, 0x3c7e923a
-0,        188,        188,       64,      207, 0x1efc5d1b
-0,        252,        252,       64,      119, 0xb2a13601
-0,        316,        316,       64,      184, 0xcafc6091
-0,        380,        380,       64,      132, 0xddd33c0b
-0,        444,        444,       64,      152, 0x83935031
-0,        508,        508,       64,      227, 0x32a86bc4
-0,        572,        572,       64,      122, 0xd04e3571
-0,        636,        636,       64,      163, 0x57d44d16
-0,        700,        700,       64,      147, 0x226043d7
-0,        764,        764,       64,      119, 0x8ad931ed
+0,     -13200,     -13200,     6400,        4, 0x02f70117, S=1, Skip Samples,       10, 0x02c80048
+0,      -6800,      -6800,     6400,      163, 0xd5f85007
+0,       -400,       -400,     6400,      127, 0x66484065
+0,       6000,       6000,     6400,       94, 0x55222bd6
+0,      12400,      12400,     6400,      314, 0x3c7e923a
+0,      18800,      18800,     6400,      207, 0x1efc5d1b
+0,      25200,      25200,     6400,      119, 0xb2a13601
+0,      31600,      31600,     6400,      184, 0xcafc6091
+0,      38000,      38000,     6400,      132, 0xddd33c0b
+0,      44400,      44400,     6400,      152, 0x83935031
+0,      50800,      50800,     6400,      227, 0x32a86bc4
+0,      57200,      57200,     6400,      122, 0xd04e3571
+0,      63600,      63600,     6400,      163, 0x57d44d16
+0,      70000,      70000,     6400,      147, 0x226043d7
+0,      76400,      76400,     6400,      119, 0x8ad931ed
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-001 b/tests/ref/fate/segment-adts-to-mkv-header-001
index c9e33e89ff..76a3d0d95d 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-001
+++ b/tests/ref/fate/segment-adts-to-mkv-header-001
@@ -1,22 +1,22 @@
 #extradata 0:        2, 0x0030001c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
 #channel_layout_name 0: mono
-0,       -132,       -132,       64,      153, 0xbb6e432f, S=1, Skip Samples,       10, 0x02c80048
-0,        -68,        -68,       64,      185, 0xa01f4ff3
-0,         -4,         -4,       64,      126, 0x85503ce6
-0,         60,         60,       64,      246, 0x652c7b59
-0,        124,        124,       64,      162, 0xc9f04da0
-0,        188,        188,       64,      135, 0x71fa3be0
-0,        252,        252,       64,      246, 0x7a6f7788
-0,        316,        316,       64,      262, 0xd3097781
-0,        380,        380,       64,       60, 0x09a118f5
-0,        444,        444,       64,      255, 0xbab5793c
-0,        508,        508,       64,      153, 0x6b6a44fb
-0,        572,        572,       64,      160, 0x550e4530
-0,        636,        636,       64,      215, 0x7fe66144
-0,        700,        700,       64,      144, 0xcd723f7d
-0,        764,        764,       64,      187, 0x2a0b5c1b
-0,        828,        828,       64,      177, 0xb8c355d5
+0,     -13200,     -13200,     6400,      153, 0xbb6e432f, S=1, Skip Samples,       10, 0x02c80048
+0,      -6800,      -6800,     6400,      185, 0xa01f4ff3
+0,       -400,       -400,     6400,      126, 0x85503ce6
+0,       6000,       6000,     6400,      246, 0x652c7b59
+0,      12400,      12400,     6400,      162, 0xc9f04da0
+0,      18800,      18800,     6400,      135, 0x71fa3be0
+0,      25200,      25200,     6400,      246, 0x7a6f7788
+0,      31600,      31600,     6400,      262, 0xd3097781
+0,      38000,      38000,     6400,       60, 0x09a118f5
+0,      44400,      44400,     6400,      255, 0xbab5793c
+0,      50800,      50800,     6400,      153, 0x6b6a44fb
+0,      57200,      57200,     6400,      160, 0x550e4530
+0,      63600,      63600,     6400,      215, 0x7fe66144
+0,      70000,      70000,     6400,      144, 0xcd723f7d
+0,      76400,      76400,     6400,      187, 0x2a0b5c1b
+0,      82800,      82800,     6400,      177, 0xb8c355d5
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-002 b/tests/ref/fate/segment-adts-to-mkv-header-002
index 9e3e8d38e9..88667a467d 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-002
+++ b/tests/ref/fate/segment-adts-to-mkv-header-002
@@ -1,9 +1,9 @@
 #extradata 0:        2, 0x0030001c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
 #channel_layout_name 0: mono
-0,       -132,       -132,       64,      156, 0x867d4f3a, S=1, Skip Samples,       10, 0x02c80048
-0,        -68,        -68,       64,      201, 0x62745ff9
-0,         -4,         -4,       64,      137, 0x90c639e0, S=1, Skip Samples,       10, 0x048a00c2
+0,     -13200,     -13200,     6400,      156, 0x867d4f3a, S=1, Skip Samples,       10, 0x02c80048
+0,      -6800,      -6800,     6400,      201, 0x62745ff9
+0,       -400,       -400,     6400,      137, 0x90c639e0, S=1, Skip Samples,       10, 0x048a00c2
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-all b/tests/ref/fate/segment-adts-to-mkv-header-all
index a262acf910..33cb2f3432 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-all
+++ b/tests/ref/fate/segment-adts-to-mkv-header-all
@@ -1,40 +1,40 @@
 #extradata 0:        2, 0x0030001c
-#tb 0: 1/1000
+#tb 0: 1/100000
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
 #channel_layout_name 0: mono
-0,       -132,       -132,       64,        4, 0x02f70117, S=1, Skip Samples,       10, 0x02c80048
-0,        -68,        -68,       64,      163, 0xd5f85007
-0,         -4,         -4,       64,      127, 0x66484065
-0,         60,         60,       64,       94, 0x55222bd6
-0,        124,        124,       64,      314, 0x3c7e923a
-0,        188,        188,       64,      207, 0x1efc5d1b
-0,        252,        252,       64,      119, 0xb2a13601
-0,        316,        316,       64,      184, 0xcafc6091
-0,        380,        380,       64,      132, 0xddd33c0b
-0,        444,        444,       64,      152, 0x83935031
-0,        508,        508,       64,      227, 0x32a86bc4
-0,        572,        572,       64,      122, 0xd04e3571
-0,        636,        636,       64,      163, 0x57d44d16
-0,        700,        700,       64,      147, 0x226043d7
-0,        764,        764,       64,      119, 0x8ad931ed
-0,        828,        828,       64,      153, 0xbb6e432f
-0,        892,        892,       64,      185, 0xa01f4ff3
-0,        956,        956,       64,      126, 0x85503ce6
-0,       1020,       1020,       64,      246, 0x652c7b59
-0,       1084,       1084,       64,      162, 0xc9f04da0
-0,       1148,       1148,       64,      135, 0x71fa3be0
-0,       1212,       1212,       64,      246, 0x7a6f7788
-0,       1276,       1276,       64,      262, 0xd3097781
-0,       1340,       1340,       64,       60, 0x09a118f5
-0,       1404,       1404,       64,      255, 0xbab5793c
-0,       1468,       1468,       64,      153, 0x6b6a44fb
-0,       1532,       1532,       64,      160, 0x550e4530
-0,       1596,       1596,       64,      215, 0x7fe66144
-0,       1660,       1660,       64,      144, 0xcd723f7d
-0,       1724,       1724,       64,      187, 0x2a0b5c1b
-0,       1788,       1788,       64,      177, 0xb8c355d5
-0,       1852,       1852,       64,      156, 0x867d4f3a
-0,       1916,       1916,       64,      201, 0x62745ff9
-0,       1980,       1980,       64,      137, 0x90c639e0, S=1, Skip Samples,       10, 0x048a00c2
+0,     -13200,     -13200,     6400,        4, 0x02f70117, S=1, Skip Samples,       10, 0x02c80048
+0,      -6800,      -6800,     6400,      163, 0xd5f85007
+0,       -400,       -400,     6400,      127, 0x66484065
+0,       6000,       6000,     6400,       94, 0x55222bd6
+0,      12400,      12400,     6400,      314, 0x3c7e923a
+0,      18800,      18800,     6400,      207, 0x1efc5d1b
+0,      25200,      25200,     6400,      119, 0xb2a13601
+0,      31600,      31600,     6400,      184, 0xcafc6091
+0,      38000,      38000,     6400,      132, 0xddd33c0b
+0,      44400,      44400,     6400,      152, 0x83935031
+0,      50800,      50800,     6400,      227, 0x32a86bc4
+0,      57200,      57200,     6400,      122, 0xd04e3571
+0,      63600,      63600,     6400,      163, 0x57d44d16
+0,      70000,      70000,     6400,      147, 0x226043d7
+0,      76400,      76400,     6400,      119, 0x8ad931ed
+0,      82800,      82800,     6400,      153, 0xbb6e432f
+0,      89200,      89200,     6400,      185, 0xa01f4ff3
+0,      95600,      95600,     6400,      126, 0x85503ce6
+0,     102000,     102000,     6400,      246, 0x652c7b59
+0,     108400,     108400,     6400,      162, 0xc9f04da0
+0,     114800,     114800,     6400,      135, 0x71fa3be0
+0,     121200,     121200,     6400,      246, 0x7a6f7788
+0,     127600,     127600,     6400,      262, 0xd3097781
+0,     134000,     134000,     6400,       60, 0x09a118f5
+0,     140400,     140400,     6400,      255, 0xbab5793c
+0,     146800,     146800,     6400,      153, 0x6b6a44fb
+0,     153200,     153200,     6400,      160, 0x550e4530
+0,     159600,     159600,     6400,      215, 0x7fe66144
+0,     166000,     166000,     6400,      144, 0xcd723f7d
+0,     172400,     172400,     6400,      187, 0x2a0b5c1b
+0,     178800,     178800,     6400,      177, 0xb8c355d5
+0,     185200,     185200,     6400,      156, 0x867d4f3a
+0,     191600,     191600,     6400,      201, 0x62745ff9
+0,     198000,     198000,     6400,      137, 0x90c639e0, S=1, Skip Samples,       10, 0x048a00c2
diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka
index 6f9a56b24a..547ca57edb 100644
--- a/tests/ref/lavf/mka
+++ b/tests/ref/lavf/mka
@@ -1,3 +1,3 @@
-b9c2d23dffba449cf1111f062b93c93f *tests/data/lavf/lavf.mka
+122f5a62a8537dc070a4427533ff25cb *tests/data/lavf/lavf.mka
 43588 tests/data/lavf/lavf.mka
 tests/data/lavf/lavf.mka CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index 4626e7af44..aba5c3c078 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,3 +1,3 @@
-1e6bddfa6a19e4c1a42401b5b0d556f0 *tests/data/lavf/lavf.mkv
-320461 tests/data/lavf/lavf.mkv
+43264298af6a8f69c07c4efd944556ad *tests/data/lavf/lavf.mkv
+320498 tests/data/lavf/lavf.mkv
 tests/data/lavf/lavf.mkv CRC=0x5df3232f
diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment
index 9af9e61ff6..8c565a0387 100644
--- a/tests/ref/lavf/mkv_attachment
+++ b/tests/ref/lavf/mkv_attachment
@@ -1,3 +1,3 @@
-74beaeb8a0ddb24490b8c8de9ee8c54f *tests/data/lavf/lavf.mkv_attachment
-472611 tests/data/lavf/lavf.mkv_attachment
+0fa9bf374a99abfd8362727f7ab445b5 *tests/data/lavf/lavf.mkv_attachment
+472648 tests/data/lavf/lavf.mkv_attachment
 tests/data/lavf/lavf.mkv_attachment CRC=0x5df3232f
diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv
index ded131cc6b..9256c4ae42 100644
--- a/tests/ref/seek/lavf-mkv
+++ b/tests/ref/seek/lavf-mkv
@@ -1,48 +1,48 @@
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    697 size:   208 skip:481 discard:0
+ret: 0         st: 1 flags:1 dts:-0.010910 pts:-0.010910 pos:    696 size:   208 skip:481 discard:0
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    913 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    912 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834
-ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834
-ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    913 size: 27837
-ret:-1         st: 1 flags:0  ts: 2.577000
-ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320173 size:   209 skip:0 discard:347
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292364 size: 27834
+ret: 0         st: 0 flags:0  ts: 0.788330
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292364 size: 27834
+ret: 0         st: 0 flags:1  ts:-0.317500
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    912 size: 27837
+ret:-1         st: 1 flags:0  ts: 2.576670
+ret: 0         st: 1 flags:1  ts: 1.470840
+ret: 0         st: 1 flags:1 dts: 0.981750 pts: 0.981750 pos: 320208 size:   209 skip:0 discard:347
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146881 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146897 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    913 size: 27837
-ret:-1         st: 0 flags:0  ts: 2.153000
-ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834
-ret: 0         st: 1 flags:0  ts:-0.058000
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    697 size:   208 skip:481 discard:0
-ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320173 size:   209 skip:0 discard:347
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    912 size: 27837
+ret:-1         st: 0 flags:0  ts: 2.153340
+ret: 0         st: 0 flags:1  ts: 1.047500
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292364 size: 27834
+ret: 0         st: 1 flags:0  ts:-0.058330
+ret: 0         st: 1 flags:1 dts:-0.010910 pts:-0.010910 pos:    696 size:   208 skip:481 discard:0
+ret: 0         st: 1 flags:1  ts: 2.835840
+ret: 0         st: 1 flags:1 dts: 0.981750 pts: 0.981750 pos: 320208 size:   209 skip:0 discard:347
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146881 size: 27925
-ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    913 size: 27837
-ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834
-ret:-1         st: 1 flags:0  ts: 1.307000
-ret: 0         st: 1 flags:1  ts: 0.201000
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    697 size:   208 skip:481 discard:0
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146897 size: 27925
+ret: 0         st: 0 flags:0  ts:-0.481660
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    912 size: 27837
+ret: 0         st: 0 flags:1  ts: 2.412510
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292364 size: 27834
+ret:-1         st: 1 flags:0  ts: 1.306670
+ret: 0         st: 1 flags:1  ts: 0.200840
+ret: 0         st: 1 flags:1 dts:-0.010910 pts:-0.010910 pos:    696 size:   208 skip:481 discard:0
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    913 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    912 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834
-ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834
-ret: 0         st: 0 flags:1  ts:-0.222000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    913 size: 27837
-ret:-1         st: 1 flags:0  ts: 2.672000
-ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320173 size:   209 skip:0 discard:347
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292364 size: 27834
+ret: 0         st: 0 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292364 size: 27834
+ret: 0         st: 0 flags:1  ts:-0.222490
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    912 size: 27837
+ret:-1         st: 1 flags:0  ts: 2.671670
+ret: 0         st: 1 flags:1  ts: 1.565840
+ret: 0         st: 1 flags:1 dts: 0.981750 pts: 0.981750 pos: 320208 size:   209 skip:0 discard:347
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146881 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146897 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    913 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    912 size: 27837