diff --git a/libraries/muxer/build.gradle b/libraries/muxer/build.gradle
index 5a03e258ca..67e4197ffa 100644
--- a/libraries/muxer/build.gradle
+++ b/libraries/muxer/build.gradle
@@ -63,6 +63,7 @@ dependencies {
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
     androidTestImplementation project(modulePrefix + 'test-utils')
     androidTestImplementation project(modulePrefix + 'lib-extractor')
+    androidTestImplementation project(modulePrefix + 'lib-exoplayer')
 }
 
 ext {
diff --git a/libraries/muxer/src/androidTest/java/androidx/media3/muxer/AndroidMuxerTestUtil.java b/libraries/muxer/src/androidTest/java/androidx/media3/muxer/AndroidMuxerTestUtil.java
index 470e73cf34..d5fa79ebf0 100644
--- a/libraries/muxer/src/androidTest/java/androidx/media3/muxer/AndroidMuxerTestUtil.java
+++ b/libraries/muxer/src/androidTest/java/androidx/media3/muxer/AndroidMuxerTestUtil.java
@@ -16,9 +16,10 @@
 package androidx.media3.muxer;
 
 import android.content.Context;
+import android.content.res.AssetFileDescriptor;
 import android.media.MediaCodec;
-import android.media.MediaExtractor;
 import androidx.media3.common.util.MediaFormatUtil;
+import androidx.media3.exoplayer.MediaExtractorCompat;
 import androidx.media3.muxer.Muxer.MuxerException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -39,9 +40,10 @@ import java.util.List;
 
   public static void feedInputDataToMuxer(Context context, Muxer muxer, String inputFileName)
       throws IOException, MuxerException {
-    MediaExtractor extractor = new MediaExtractor();
-    extractor.setDataSource(
-        context.getResources().getAssets().openFd(MP4_FILE_ASSET_DIRECTORY + inputFileName));
+    MediaExtractorCompat extractor = new MediaExtractorCompat(context);
+    AssetFileDescriptor fd =
+        context.getResources().getAssets().openFd(MP4_FILE_ASSET_DIRECTORY + inputFileName);
+    extractor.setDataSource(fd);
 
     List<Muxer.TrackToken> addedTracks = new ArrayList<>();
     for (int i = 0; i < extractor.getTrackCount(); i++) {
@@ -69,5 +71,6 @@ import java.util.List;
     } while (extractor.advance());
 
     extractor.release();
+    fd.close();
   }
 }
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump
index d894205389..05d30352ae 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump
@@ -26,413 +26,413 @@ track 0:
   sample 0:
     time = 0
     flags = 1
-    data = length 189, hash 52080AE0
+    data = length 189, hash 52415563
   sample 1:
     time = 0
     flags = 1
-    data = length 179, hash 8C37301
+    data = length 179, hash 8C3EF02
   sample 2:
     time = 16000
     flags = 1
-    data = length 242, hash 1582B575
+    data = length 242, hash 154901F6
   sample 3:
     time = 40000
     flags = 1
-    data = length 255, hash 98244FA3
+    data = length 255, hash 9824CF65
   sample 4:
     time = 72000
     flags = 1
-    data = length 240, hash 71BDFCD9
+    data = length 240, hash 71BE7C9B
   sample 5:
     time = 104000
     flags = 1
-    data = length 253, hash EFD3DBFF
+    data = length 253, hash EFD45BC1
   sample 6:
     time = 136000
     flags = 1
-    data = length 242, hash AACF8258
+    data = length 242, hash AAD0021A
   sample 7:
     time = 168000
     flags = 1
-    data = length 245, hash 1CC8835E
+    data = length 245, hash 1CC90320
   sample 8:
     time = 200000
     flags = 1
-    data = length 250, hash FD19F7C0
+    data = length 250, hash FD1A7782
   sample 9:
     time = 232000
     flags = 1
-    data = length 250, hash 8AF27182
+    data = length 250, hash 8AF2F144
   sample 10:
     time = 264000
     flags = 1
-    data = length 242, hash B82131C5
+    data = length 242, hash B821B187
   sample 11:
     time = 296000
     flags = 1
-    data = length 249, hash 38239C5F
+    data = length 249, hash 38241C21
   sample 12:
     time = 328000
     flags = 1
-    data = length 245, hash D2FB1E64
+    data = length 245, hash D2FB9E26
   sample 13:
     time = 360000
     flags = 1
-    data = length 246, hash C1FC7B6A
+    data = length 246, hash C1FCFB2C
   sample 14:
     time = 392000
     flags = 1
-    data = length 247, hash 2598BCEB
+    data = length 247, hash 25993CAD
   sample 15:
     time = 424000
     flags = 1
-    data = length 248, hash 56C3B18C
+    data = length 248, hash 56C4314E
   sample 16:
     time = 456000
     flags = 1
-    data = length 253, hash A93E963E
+    data = length 253, hash A93F1600
   sample 17:
     time = 488000
     flags = 1
-    data = length 250, hash B06DDB1E
+    data = length 250, hash B06E5AE0
   sample 18:
     time = 520000
     flags = 1
-    data = length 242, hash 26EBF2C6
+    data = length 242, hash 26EC7288
   sample 19:
     time = 552000
     flags = 1
-    data = length 258, hash 35393C2
+    data = length 258, hash 3541384
   sample 20:
     time = 584000
     flags = 1
-    data = length 253, hash C4C2692F
+    data = length 253, hash C4C2E8F1
   sample 21:
     time = 616000
     flags = 1
-    data = length 254, hash 4796C450
+    data = length 254, hash 47974412
   sample 22:
     time = 648000
     flags = 1
-    data = length 245, hash DDECF577
+    data = length 245, hash DDED7539
   sample 23:
     time = 680000
     flags = 1
-    data = length 252, hash 5D243245
+    data = length 252, hash 5D24B207
   sample 24:
     time = 712000
     flags = 1
-    data = length 189, hash AA61F7FC
+    data = length 189, hash AA28447D
   sample 25:
     time = 736000
     flags = 1
-    data = length 184, hash 87D9A9A6
+    data = length 184, hash 87DA25A7
   sample 26:
     time = 752000
     flags = 1
-    data = length 187, hash C94C11BE
+    data = length 187, hash C94C8DBF
   sample 27:
     time = 768000
     flags = 1
-    data = length 256, hash 36CB9380
+    data = length 256, hash 3691E001
   sample 28:
     time = 792000
     flags = 1
-    data = length 262, hash B729F6C9
+    data = length 262, hash B72A768B
   sample 29:
     time = 824000
     flags = 1
-    data = length 252, hash 1AF3D36B
+    data = length 252, hash 1AF4532D
   sample 30:
     time = 856000
     flags = 1
-    data = length 260, hash 9C2CA006
+    data = length 260, hash 9C2D1FC8
   sample 31:
     time = 888000
     flags = 1
-    data = length 257, hash CDC89AFD
+    data = length 257, hash CDC91ABF
   sample 32:
     time = 920000
     flags = 1
-    data = length 247, hash 425DFE94
+    data = length 247, hash 425E7E56
   sample 33:
     time = 952000
     flags = 1
-    data = length 254, hash 97F2A00F
+    data = length 254, hash 97F31FD1
   sample 34:
     time = 984000
     flags = 1
-    data = length 259, hash 5CFD2BD1
+    data = length 259, hash 5CFC46D4
   sample 35:
     time = 1016000
     flags = 1
-    data = length 262, hash A1B3B3A6
+    data = length 262, hash A1B43368
   sample 36:
     time = 1048000
     flags = 1
-    data = length 258, hash A54300B3
+    data = length 258, hash A5438075
   sample 37:
     time = 1080000
     flags = 1
-    data = length 242, hash 1CCE647C
+    data = length 242, hash 1CCEE43E
   sample 38:
     time = 1112000
     flags = 1
-    data = length 249, hash 6B917E41
+    data = length 249, hash 6B91FE03
   sample 39:
     time = 1144000
     flags = 1
-    data = length 246, hash 86324731
+    data = length 246, hash 8632C6F3
   sample 40:
     time = 1176000
     flags = 1
-    data = length 263, hash 4B98FCB4
+    data = length 263, hash 4B997C76
   sample 41:
     time = 1208000
     flags = 1
-    data = length 247, hash 16B758D0
+    data = length 247, hash 16B7D892
   sample 42:
     time = 1240000
     flags = 1
-    data = length 189, hash CDA345D1
+    data = length 189, hash CD699252
   sample 43:
     time = 1264000
     flags = 1
-    data = length 183, hash 1538735F
+    data = length 183, hash 1538EF60
   sample 44:
     time = 1280000
     flags = 1
-    data = length 183, hash 47117509
+    data = length 183, hash 4711F10A
   sample 45:
     time = 1296000
     flags = 1
-    data = length 188, hash 7E7B0A91
+    data = length 188, hash 7E7B8692
   sample 46:
     time = 1312000
     flags = 1
-    data = length 185, hash 5A283C8F
+    data = length 185, hash 5A28B890
   sample 47:
     time = 1328000
     flags = 1
-    data = length 254, hash 7A56B0F0
+    data = length 254, hash 7A1CFD71
   sample 48:
     time = 1352000
     flags = 1
-    data = length 257, hash 4180CACF
+    data = length 257, hash 41814A91
   sample 49:
     time = 1384000
     flags = 1
-    data = length 256, hash 392BF996
+    data = length 256, hash 392C7958
   sample 50:
     time = 1416000
     flags = 1
-    data = length 259, hash 36E26615
+    data = length 259, hash 36E2E5D7
   sample 51:
     time = 1448000
     flags = 1
-    data = length 258, hash E7A523F0
+    data = length 258, hash E7A5A3B2
   sample 52:
     time = 1480000
     flags = 1
-    data = length 254, hash BB991F97
+    data = length 254, hash BB999F59
   sample 53:
     time = 1512000
     flags = 1
-    data = length 264, hash EBD1FD4F
+    data = length 264, hash EBD27D11
   sample 54:
     time = 1544000
     flags = 1
-    data = length 256, hash EF1FA741
+    data = length 256, hash EF202703
   sample 55:
     time = 1576000
     flags = 1
-    data = length 253, hash AA10B2A
+    data = length 253, hash AA18AEC
   sample 56:
     time = 1608000
     flags = 1
-    data = length 258, hash C995778
+    data = length 258, hash C99D73A
   sample 57:
     time = 1640000
     flags = 1
-    data = length 243, hash 37667B06
+    data = length 243, hash 3766FAC8
   sample 58:
     time = 1672000
     flags = 1
-    data = length 254, hash A1263AA0
+    data = length 254, hash A126BA62
   sample 59:
     time = 1704000
     flags = 1
-    data = length 194, hash E7EB2AFD
+    data = length 194, hash E7B1777E
   sample 60:
     time = 1728000
     flags = 1
-    data = length 192, hash 9405895B
+    data = length 192, hash 9406055C
   sample 61:
     time = 1744000
     flags = 1
-    data = length 254, hash A0F66B2E
+    data = length 254, hash A0BCB7AF
   sample 62:
     time = 1768000
     flags = 1
-    data = length 249, hash 2B815793
+    data = length 249, hash 2B81D755
   sample 63:
     time = 1800000
     flags = 1
-    data = length 254, hash 8A845D4F
+    data = length 254, hash 8A84DD11
   sample 64:
     time = 1832000
     flags = 1
-    data = length 247, hash 32E3FF95
+    data = length 247, hash 32E47F57
   sample 65:
     time = 1864000
     flags = 1
-    data = length 185, hash DCD1005B
+    data = length 185, hash DC974CDC
   sample 66:
     time = 1888000
     flags = 1
-    data = length 191, hash 9EF9175D
+    data = length 191, hash 9EF9935E
   sample 67:
     time = 1904000
     flags = 1
-    data = length 251, hash 8B20EFE4
+    data = length 251, hash 8AE73C65
   sample 68:
     time = 1928000
     flags = 1
-    data = length 251, hash 2A349E41
+    data = length 251, hash 2A351E03
   sample 69:
     time = 1960000
     flags = 1
-    data = length 254, hash C4977BE
+    data = length 254, hash C49F780
   sample 70:
     time = 1992000
     flags = 1
-    data = length 240, hash 230286DE
+    data = length 240, hash 233BD522
   sample 71:
     time = 2024000
     flags = 1
-    data = length 259, hash 19565AB6
+    data = length 259, hash 1956DA78
   sample 72:
     time = 2056000
     flags = 1
-    data = length 248, hash 1EE00686
+    data = length 248, hash 1EE08648
   sample 73:
     time = 2088000
     flags = 1
-    data = length 245, hash C5DA60D6
+    data = length 245, hash C5DAE098
   sample 74:
     time = 2120000
     flags = 1
-    data = length 243, hash B5DF7416
+    data = length 243, hash B5DFF3D8
   sample 75:
     time = 2152000
     flags = 1
-    data = length 263, hash 43CEE6FD
+    data = length 263, hash 43CF66BF
   sample 76:
     time = 2184000
     flags = 1
-    data = length 257, hash 4B30653E
+    data = length 257, hash 4B30E500
   sample 77:
     time = 2216000
     flags = 1
-    data = length 262, hash 2C3B847A
+    data = length 262, hash 2C3C043C
   sample 78:
     time = 2248000
     flags = 1
-    data = length 246, hash A5398B6D
+    data = length 246, hash A53A0B2F
   sample 79:
     time = 2280000
     flags = 1
-    data = length 252, hash 54031889
+    data = length 252, hash 5403984B
   sample 80:
     time = 2312000
     flags = 1
-    data = length 243, hash CD416D89
+    data = length 243, hash CD41ED4B
   sample 81:
     time = 2344000
     flags = 1
-    data = length 247, hash 37940B14
+    data = length 247, hash 37948AD6
   sample 82:
     time = 2376000
     flags = 1
-    data = length 255, hash E5973397
+    data = length 255, hash E597B359
   sample 83:
     time = 2408000
     flags = 1
-    data = length 250, hash EEF7942C
+    data = length 250, hash EEF813EE
   sample 84:
     time = 2440000
     flags = 1
-    data = length 255, hash D3E3D314
+    data = length 255, hash D3E452D6
   sample 85:
     time = 2472000
     flags = 1
-    data = length 250, hash 5CC231E2
+    data = length 250, hash 5CC2B1A4
   sample 86:
     time = 2504000
     flags = 1
-    data = length 252, hash 55453FFB
+    data = length 252, hash 5545BFBD
   sample 87:
     time = 2536000
     flags = 1
-    data = length 265, hash 6653F47
+    data = length 265, hash 665BF09
   sample 88:
     time = 2568000
     flags = 1
-    data = length 264, hash A8029392
+    data = length 264, hash A8031354
   sample 89:
     time = 2600000
     flags = 1
-    data = length 262, hash A0016CDE
+    data = length 262, hash A001ECA0
   sample 90:
     time = 2632000
     flags = 1
-    data = length 257, hash 64872E6A
+    data = length 257, hash 6487AE2C
   sample 91:
     time = 2664000
     flags = 1
-    data = length 245, hash 29A516B2
+    data = length 245, hash 29A59674
   sample 92:
     time = 2696000
     flags = 1
-    data = length 250, hash 3A9E8EC3
+    data = length 250, hash 3A9F0E85
   sample 93:
     time = 2728000
     flags = 1
-    data = length 252, hash 78D64CE9
+    data = length 252, hash 78D6CCAB
   sample 94:
     time = 2760000
     flags = 1
-    data = length 250, hash 4CAB463A
+    data = length 250, hash 4CABC5FC
   sample 95:
     time = 2792000
     flags = 1
-    data = length 249, hash A1079906
+    data = length 249, hash A10818C8
   sample 96:
     time = 2824000
     flags = 1
-    data = length 255, hash EEAA6634
+    data = length 255, hash EEAAE5F6
   sample 97:
     time = 2856000
     flags = 1
-    data = length 256, hash BFD77057
+    data = length 256, hash BFD7F019
   sample 98:
     time = 2888000
     flags = 1
-    data = length 249, hash 9ED80271
+    data = length 249, hash 9ED88233
   sample 99:
     time = 2920000
     flags = 1
-    data = length 252, hash 2C3206C8
+    data = length 252, hash 2C32868A
   sample 100:
     time = 2952000
     flags = 1
-    data = length 134, hash AA8D9693
+    data = length 134, hash AA53E314
   sample 101:
     time = 2976000
     flags = 1
-    data = length 180, hash 63217EFD
+    data = length 180, hash 6321FAFE
   sample 102:
     time = 2992000
     flags = 536870913
-    data = length 179, hash 8529BBE7
+    data = length 179, hash 8563EF28
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump
index 203ea13ce5..f0c8456245 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 3013500
+  duration = 3020000
   getPosition(0) = [[timeUs=0, position=400052]]
   getPosition(1) = [[timeUs=1, position=400052]]
-  getPosition(1506750) = [[timeUs=1506750, position=449844]]
-  getPosition(3013500) = [[timeUs=3013500, position=499769]]
+  getPosition(1510000) = [[timeUs=1510000, position=449844]]
+  getPosition(3020000) = [[timeUs=3020000, position=499769]]
 numberOfTracks = 1
 track 0:
   total output bytes = 100872
   sample count = 151
-  track duration = 3013500
+  track duration = 3020000
   format 0:
     id = 1
     containerMimeType = audio/mp4
@@ -28,603 +28,603 @@ track 0:
     flags = 1
     data = length 949, hash E49C1A9D
   sample 1:
-    time = 13500
+    time = 20000
     flags = 1
     data = length 608, hash F65C6881
   sample 2:
-    time = 33500
+    time = 40000
     flags = 1
     data = length 650, hash 914AF7E1
   sample 3:
-    time = 53500
+    time = 60000
     flags = 1
     data = length 603, hash B3EC7A47
   sample 4:
-    time = 73500
+    time = 80000
     flags = 1
     data = length 650, hash 162CA2A3
   sample 5:
-    time = 93500
+    time = 100000
     flags = 1
     data = length 678, hash 192785A9
   sample 6:
-    time = 113500
+    time = 120000
     flags = 1
     data = length 685, hash 96C2F2BB
   sample 7:
-    time = 133500
+    time = 140000
     flags = 1
     data = length 665, hash 5922AAEB
   sample 8:
-    time = 153500
+    time = 160000
     flags = 1
     data = length 646, hash 8619B832
   sample 9:
-    time = 173500
+    time = 180000
     flags = 1
     data = length 644, hash AFAFE536
   sample 10:
-    time = 193500
+    time = 200000
     flags = 1
     data = length 629, hash 9E73B0B7
   sample 11:
-    time = 213500
+    time = 220000
     flags = 1
     data = length 610, hash 669587E0
   sample 12:
-    time = 233500
+    time = 240000
     flags = 1
     data = length 663, hash D7642DB7
   sample 13:
-    time = 253500
+    time = 260000
     flags = 1
     data = length 648, hash 6D0CD0D2
   sample 14:
-    time = 273500
+    time = 280000
     flags = 1
     data = length 642, hash 412DC4E2
   sample 15:
-    time = 293500
+    time = 300000
     flags = 1
     data = length 607, hash F9582E56
   sample 16:
-    time = 313500
+    time = 320000
     flags = 1
     data = length 645, hash 657B023B
   sample 17:
-    time = 333500
+    time = 340000
     flags = 1
     data = length 672, hash AA362E4A
   sample 18:
-    time = 353500
+    time = 360000
     flags = 1
     data = length 629, hash 9E527BB
   sample 19:
-    time = 373500
+    time = 380000
     flags = 1
     data = length 646, hash F3B96232
   sample 20:
-    time = 393500
+    time = 400000
     flags = 1
     data = length 611, hash 9B3061C
   sample 21:
-    time = 413500
+    time = 420000
     flags = 1
     data = length 664, hash 50774FBE
   sample 22:
-    time = 433500
+    time = 440000
     flags = 1
     data = length 650, hash 52AA7B95
   sample 23:
-    time = 453500
+    time = 460000
     flags = 1
     data = length 636, hash F5CB417D
   sample 24:
-    time = 473500
+    time = 480000
     flags = 1
     data = length 665, hash 34C938BB
   sample 25:
-    time = 493500
+    time = 500000
     flags = 1
     data = length 626, hash 5CD7E3F8
   sample 26:
-    time = 513500
+    time = 520000
     flags = 1
     data = length 651, hash AF7BDD5F
   sample 27:
-    time = 533500
+    time = 540000
     flags = 1
     data = length 635, hash FF8E92FE
   sample 28:
-    time = 553500
+    time = 560000
     flags = 1
     data = length 655, hash CC0821A7
   sample 29:
-    time = 573500
+    time = 580000
     flags = 1
     data = length 636, hash 1BDC263F
   sample 30:
-    time = 593500
+    time = 600000
     flags = 1
     data = length 641, hash 5ECE0258
   sample 31:
-    time = 613500
+    time = 620000
     flags = 1
     data = length 632, hash FA762551
   sample 32:
-    time = 633500
+    time = 640000
     flags = 1
     data = length 656, hash 97F5501A
   sample 33:
-    time = 653500
+    time = 660000
     flags = 1
     data = length 657, hash 462517A5
   sample 34:
-    time = 673500
+    time = 680000
     flags = 1
     data = length 651, hash 8863CCAD
   sample 35:
-    time = 693500
+    time = 700000
     flags = 1
     data = length 648, hash B0330C37
   sample 36:
-    time = 713500
+    time = 720000
     flags = 1
     data = length 674, hash 60E12F33
   sample 37:
-    time = 733500
+    time = 740000
     flags = 1
     data = length 674, hash DEFEB445
   sample 38:
-    time = 753500
+    time = 760000
     flags = 1
     data = length 583, hash C8326130
   sample 39:
-    time = 773500
+    time = 780000
     flags = 1
     data = length 677, hash 5FADD0
   sample 40:
-    time = 793500
+    time = 800000
     flags = 1
     data = length 637, hash CB97E2B8
   sample 41:
-    time = 813500
+    time = 820000
     flags = 1
     data = length 637, hash 7D230BE4
   sample 42:
-    time = 833500
+    time = 840000
     flags = 1
     data = length 651, hash 230EE90B
   sample 43:
-    time = 853500
+    time = 860000
     flags = 1
     data = length 637, hash F0CCCAE
   sample 44:
-    time = 873500
+    time = 880000
     flags = 1
     data = length 634, hash D0F5AEEB
   sample 45:
-    time = 893500
+    time = 900000
     flags = 1
     data = length 620, hash 680A7962
   sample 46:
-    time = 913500
+    time = 920000
     flags = 1
     data = length 701, hash 18050131
   sample 47:
-    time = 933500
+    time = 940000
     flags = 1
     data = length 700, hash B948FC3B
   sample 48:
-    time = 953500
+    time = 960000
     flags = 1
     data = length 732, hash 5F8C11AD
   sample 49:
-    time = 973500
+    time = 980000
     flags = 1
     data = length 632, hash 66D306D1
   sample 50:
-    time = 993500
+    time = 1000000
     flags = 1
     data = length 666, hash C7130EE0
   sample 51:
-    time = 1013500
+    time = 1020000
     flags = 1
     data = length 706, hash A3199353
   sample 52:
-    time = 1033500
+    time = 1040000
     flags = 1
     data = length 717, hash E98C450C
   sample 53:
-    time = 1053500
+    time = 1060000
     flags = 1
     data = length 699, hash E55D6BF1
   sample 54:
-    time = 1073500
+    time = 1080000
     flags = 1
     data = length 654, hash 6788EEF5
   sample 55:
-    time = 1093500
+    time = 1100000
     flags = 1
     data = length 668, hash 104C1F00
   sample 56:
-    time = 1113500
+    time = 1120000
     flags = 1
     data = length 632, hash 57EEBA22
   sample 57:
-    time = 1133500
+    time = 1140000
     flags = 1
     data = length 633, hash 8ECAA570
   sample 58:
-    time = 1153500
+    time = 1160000
     flags = 1
     data = length 631, hash 2583F94B
   sample 59:
-    time = 1173500
+    time = 1180000
     flags = 1
     data = length 657, hash 47C82A61
   sample 60:
-    time = 1193500
+    time = 1200000
     flags = 1
     data = length 734, hash CB4105D8
   sample 61:
-    time = 1213500
+    time = 1220000
     flags = 1
     data = length 626, hash FFFFF6A0
   sample 62:
-    time = 1233500
+    time = 1240000
     flags = 1
     data = length 647, hash 12B4EE0
   sample 63:
-    time = 1253500
+    time = 1260000
     flags = 1
     data = length 625, hash 33781766
   sample 64:
-    time = 1273500
+    time = 1280000
     flags = 1
     data = length 642, hash 4EFBA7BD
   sample 65:
-    time = 1293500
+    time = 1300000
     flags = 1
     data = length 802, hash 1E1ECCCC
   sample 66:
-    time = 1313500
+    time = 1320000
     flags = 1
     data = length 831, hash 3B6EB119
   sample 67:
-    time = 1333500
+    time = 1340000
     flags = 1
     data = length 803, hash 1A6D1B26
   sample 68:
-    time = 1353500
+    time = 1360000
     flags = 1
     data = length 724, hash 373CBA2
   sample 69:
-    time = 1373500
+    time = 1380000
     flags = 1
     data = length 697, hash B88E6225
   sample 70:
-    time = 1393500
+    time = 1400000
     flags = 1
     data = length 684, hash 582095ED
   sample 71:
-    time = 1413500
+    time = 1420000
     flags = 1
     data = length 642, hash E3396634
   sample 72:
-    time = 1433500
+    time = 1440000
     flags = 1
     data = length 660, hash 6B7A6B93
   sample 73:
-    time = 1453500
+    time = 1460000
     flags = 1
     data = length 658, hash BD7B7172
   sample 74:
-    time = 1473500
+    time = 1480000
     flags = 1
     data = length 682, hash 1B77F311
   sample 75:
-    time = 1493500
+    time = 1500000
     flags = 1
     data = length 635, hash 4993E2E8
   sample 76:
-    time = 1513500
+    time = 1520000
     flags = 1
     data = length 670, hash 1F1F426A
   sample 77:
-    time = 1533500
+    time = 1540000
     flags = 1
     data = length 633, hash 1A6AE4
   sample 78:
-    time = 1553500
+    time = 1560000
     flags = 1
     data = length 653, hash 55540278
   sample 79:
-    time = 1573500
+    time = 1580000
     flags = 1
     data = length 618, hash A50A27BC
   sample 80:
-    time = 1593500
+    time = 1600000
     flags = 1
     data = length 657, hash C61CC3D5
   sample 81:
-    time = 1613500
+    time = 1620000
     flags = 1
     data = length 608, hash 2691ABBB
   sample 82:
-    time = 1633500
+    time = 1640000
     flags = 1
     data = length 673, hash 6CFC36BC
   sample 83:
-    time = 1653500
+    time = 1660000
     flags = 1
     data = length 646, hash C12DD9A3
   sample 84:
-    time = 1673500
+    time = 1680000
     flags = 1
     data = length 665, hash FF2B77B0
   sample 85:
-    time = 1693500
+    time = 1700000
     flags = 1
     data = length 644, hash 2BBF36A5
   sample 86:
-    time = 1713500
+    time = 1720000
     flags = 1
     data = length 750, hash 4510EA7E
   sample 87:
-    time = 1733500
+    time = 1740000
     flags = 1
     data = length 763, hash 22955796
   sample 88:
-    time = 1753500
+    time = 1760000
     flags = 1
     data = length 638, hash 8AC8492E
   sample 89:
-    time = 1773500
+    time = 1780000
     flags = 1
     data = length 659, hash 6CCFCDC4
   sample 90:
-    time = 1793500
+    time = 1800000
     flags = 1
     data = length 653, hash ED5CB356
   sample 91:
-    time = 1813500
+    time = 1820000
     flags = 1
     data = length 625, hash A49FB079
   sample 92:
-    time = 1833500
+    time = 1840000
     flags = 1
     data = length 681, hash 29FCE7E6
   sample 93:
-    time = 1853500
+    time = 1860000
     flags = 1
     data = length 719, hash B6E2BE04
   sample 94:
-    time = 1873500
+    time = 1880000
     flags = 1
     data = length 659, hash 455A8590
   sample 95:
-    time = 1893500
+    time = 1900000
     flags = 1
     data = length 711, hash D970780F
   sample 96:
-    time = 1913500
+    time = 1920000
     flags = 1
     data = length 649, hash 7B05E203
   sample 97:
-    time = 1933500
+    time = 1940000
     flags = 1
     data = length 621, hash A06A54BD
   sample 98:
-    time = 1953500
+    time = 1960000
     flags = 1
     data = length 740, hash F5B727FA
   sample 99:
-    time = 1973500
+    time = 1980000
     flags = 1
     data = length 829, hash 24C8AD34
   sample 100:
-    time = 1993500
+    time = 2000000
     flags = 1
     data = length 646, hash E8292CD3
   sample 101:
-    time = 2013500
+    time = 2020000
     flags = 1
     data = length 628, hash D2CF6E04
   sample 102:
-    time = 2033500
+    time = 2040000
     flags = 1
     data = length 621, hash B1DEB04E
   sample 103:
-    time = 2053500
+    time = 2060000
     flags = 1
     data = length 783, hash 35A1171
   sample 104:
-    time = 2073500
+    time = 2080000
     flags = 1
     data = length 661, hash 7BFCA7CB
   sample 105:
-    time = 2093500
+    time = 2100000
     flags = 1
     data = length 616, hash 27080B66
   sample 106:
-    time = 2113500
+    time = 2120000
     flags = 1
     data = length 700, hash E3450B94
   sample 107:
-    time = 2133500
+    time = 2140000
     flags = 1
     data = length 631, hash 4223054B
   sample 108:
-    time = 2153500
+    time = 2160000
     flags = 1
     data = length 650, hash DB573283
   sample 109:
-    time = 2173500
+    time = 2180000
     flags = 1
     data = length 649, hash 619E7468
   sample 110:
-    time = 2193500
+    time = 2200000
     flags = 1
     data = length 628, hash 9BD367C7
   sample 111:
-    time = 2213500
+    time = 2220000
     flags = 1
     data = length 693, hash 85E9290
   sample 112:
-    time = 2233500
+    time = 2240000
     flags = 1
     data = length 645, hash CAC17B47
   sample 113:
-    time = 2253500
+    time = 2260000
     flags = 1
     data = length 639, hash 88A52980
   sample 114:
-    time = 2273500
+    time = 2280000
     flags = 1
     data = length 657, hash DAF95EA7
   sample 115:
-    time = 2293500
+    time = 2300000
     flags = 1
     data = length 635, hash 2F950D30
   sample 116:
-    time = 2313500
+    time = 2320000
     flags = 1
     data = length 649, hash 48E900E
   sample 117:
-    time = 2333500
+    time = 2340000
     flags = 1
     data = length 657, hash 4505A6CE
   sample 118:
-    time = 2353500
+    time = 2360000
     flags = 1
     data = length 682, hash DC4C8CD8
   sample 119:
-    time = 2373500
+    time = 2380000
     flags = 1
     data = length 711, hash 21B58FD3
   sample 120:
-    time = 2393500
+    time = 2400000
     flags = 1
     data = length 692, hash 4CDFB1C7
   sample 121:
-    time = 2413500
+    time = 2420000
     flags = 1
     data = length 693, hash B531D8C8
   sample 122:
-    time = 2433500
+    time = 2440000
     flags = 1
     data = length 650, hash AF15E260
   sample 123:
-    time = 2453500
+    time = 2460000
     flags = 1
     data = length 643, hash EDF00663
   sample 124:
-    time = 2473500
+    time = 2480000
     flags = 1
     data = length 623, hash 1B0243A
   sample 125:
-    time = 2493500
+    time = 2500000
     flags = 1
     data = length 639, hash 21B0BA43
   sample 126:
-    time = 2513500
+    time = 2520000
     flags = 1
     data = length 694, hash 46FA242C
   sample 127:
-    time = 2533500
+    time = 2540000
     flags = 1
     data = length 637, hash 1CEAEA46
   sample 128:
-    time = 2553500
+    time = 2560000
     flags = 1
     data = length 672, hash A8FE01B1
   sample 129:
-    time = 2573500
+    time = 2580000
     flags = 1
     data = length 655, hash F4ACFC61
   sample 130:
-    time = 2593500
+    time = 2600000
     flags = 1
     data = length 674, hash 3B3D15B6
   sample 131:
-    time = 2613500
+    time = 2620000
     flags = 1
     data = length 695, hash DF376589
   sample 132:
-    time = 2633500
+    time = 2640000
     flags = 1
     data = length 688, hash A2425D57
   sample 133:
-    time = 2653500
+    time = 2660000
     flags = 1
     data = length 690, hash BBD3DA9B
   sample 134:
-    time = 2673500
+    time = 2680000
     flags = 1
     data = length 732, hash F7B00D40
   sample 135:
-    time = 2693500
+    time = 2700000
     flags = 1
     data = length 684, hash 9158FEAB
   sample 136:
-    time = 2713500
+    time = 2720000
     flags = 1
     data = length 674, hash 40C7501A
   sample 137:
-    time = 2733500
+    time = 2740000
     flags = 1
     data = length 680, hash BB132A40
   sample 138:
-    time = 2753500
+    time = 2760000
     flags = 1
     data = length 648, hash 1114376E
   sample 139:
-    time = 2773500
+    time = 2780000
     flags = 1
     data = length 661, hash DE71BACA
   sample 140:
-    time = 2793500
+    time = 2800000
     flags = 1
     data = length 642, hash A2316E7
   sample 141:
-    time = 2813500
+    time = 2820000
     flags = 1
     data = length 662, hash C7117D4
   sample 142:
-    time = 2833500
+    time = 2840000
     flags = 1
     data = length 638, hash 2CF77EF4
   sample 143:
-    time = 2853500
+    time = 2860000
     flags = 1
     data = length 655, hash E5A75C8B
   sample 144:
-    time = 2873500
+    time = 2880000
     flags = 1
     data = length 635, hash C9E2B5B1
   sample 145:
-    time = 2893500
+    time = 2900000
     flags = 1
     data = length 655, hash 6F99C63E
   sample 146:
-    time = 2913500
+    time = 2920000
     flags = 1
     data = length 638, hash 64436E98
   sample 147:
-    time = 2933500
+    time = 2940000
     flags = 1
     data = length 671, hash 5DFDE09A
   sample 148:
-    time = 2953500
+    time = 2960000
     flags = 1
     data = length 661, hash 5203D894
   sample 149:
-    time = 2973500
+    time = 2980000
     flags = 1
     data = length 664, hash CF30C6D7
   sample 150:
-    time = 2993500
+    time = 3000000
     flags = 536870913
     data = length 1155, hash F5AFA236
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump
index 51439fe405..d26225099e 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump
@@ -15,9 +15,8 @@ track 0:
     containerMimeType = audio/mp4
     sampleMimeType = audio/amr-wb
     maxInputSize = 89
-    channelCount = 1
+    channelCount = 2
     sampleRate = 16000
-    encoderDelay = 80
     language = und
     metadata = entries=[Mp4Timestamp: creation time=100000000, modification time=500000000, timescale=10000]
   sample 0:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump
index a1c938be72..a3b50db8a4 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump
@@ -15,612 +15,612 @@ track 0:
     containerMimeType = audio/mp4
     sampleMimeType = audio/3gpp
     maxInputSize = 62
-    channelCount = 1
+    channelCount = 2
     sampleRate = 8000
     language = und
     metadata = entries=[Mp4Timestamp: creation time=100000000, modification time=500000000, timescale=10000]
   sample 0:
-    time = -6250
+    time = 0
     flags = 1
     data = length 32, hash 53582FC7
   sample 1:
-    time = 13750
+    time = 20000
     flags = 1
     data = length 32, hash 5685F9D6
   sample 2:
-    time = 33750
+    time = 40000
     flags = 1
     data = length 32, hash 979442D3
   sample 3:
-    time = 53750
+    time = 60000
     flags = 1
     data = length 32, hash D6C2D2B3
   sample 4:
-    time = 73750
+    time = 80000
     flags = 1
     data = length 32, hash 4D7A467C
   sample 5:
-    time = 93750
+    time = 100000
     flags = 1
     data = length 32, hash D24FBF21
   sample 6:
-    time = 113750
+    time = 120000
     flags = 1
     data = length 32, hash 39A010D0
   sample 7:
-    time = 133750
+    time = 140000
     flags = 1
     data = length 32, hash 238FB065
   sample 8:
-    time = 153750
+    time = 160000
     flags = 1
     data = length 32, hash 7F460D8F
   sample 9:
-    time = 173750
+    time = 180000
     flags = 1
     data = length 32, hash 4144D57A
   sample 10:
-    time = 193750
+    time = 200000
     flags = 1
     data = length 32, hash 17FAFC32
   sample 11:
-    time = 213750
+    time = 220000
     flags = 1
     data = length 32, hash BBB92AF1
   sample 12:
-    time = 233750
+    time = 240000
     flags = 1
     data = length 32, hash 8662DF11
   sample 13:
-    time = 253750
+    time = 260000
     flags = 1
     data = length 32, hash ADE12517
   sample 14:
-    time = 273750
+    time = 280000
     flags = 1
     data = length 32, hash 42A2F90
   sample 15:
-    time = 293750
+    time = 300000
     flags = 1
     data = length 32, hash BA4736EE
   sample 16:
-    time = 313750
+    time = 320000
     flags = 1
     data = length 32, hash DC3899EE
   sample 17:
-    time = 333750
+    time = 340000
     flags = 1
     data = length 32, hash 9680E057
   sample 18:
-    time = 353750
+    time = 360000
     flags = 1
     data = length 32, hash 9DD4439A
   sample 19:
-    time = 373750
+    time = 380000
     flags = 1
     data = length 32, hash A187A2E8
   sample 20:
-    time = 393750
+    time = 400000
     flags = 1
     data = length 32, hash 2181AFA7
   sample 21:
-    time = 413750
+    time = 420000
     flags = 1
     data = length 32, hash 2C46A44
   sample 22:
-    time = 433750
+    time = 440000
     flags = 1
     data = length 32, hash 45492E08
   sample 23:
-    time = 453750
+    time = 460000
     flags = 1
     data = length 32, hash 7E8B40BC
   sample 24:
-    time = 473750
+    time = 480000
     flags = 1
     data = length 32, hash 8A572FB6
   sample 25:
-    time = 493750
+    time = 500000
     flags = 1
     data = length 32, hash 271382F7
   sample 26:
-    time = 513750
+    time = 520000
     flags = 1
     data = length 32, hash 31B52A2C
   sample 27:
-    time = 533750
+    time = 540000
     flags = 1
     data = length 32, hash 1C0C6ACD
   sample 28:
-    time = 553750
+    time = 560000
     flags = 1
     data = length 32, hash 12AF988B
   sample 29:
-    time = 573750
+    time = 580000
     flags = 1
     data = length 32, hash 1EC318A2
   sample 30:
-    time = 593750
+    time = 600000
     flags = 1
     data = length 32, hash F0082E10
   sample 31:
-    time = 613750
+    time = 620000
     flags = 1
     data = length 32, hash 6F21FBC4
   sample 32:
-    time = 633750
+    time = 640000
     flags = 1
     data = length 32, hash A52D353D
   sample 33:
-    time = 653750
+    time = 660000
     flags = 1
     data = length 32, hash C1B9C8E2
   sample 34:
-    time = 673750
+    time = 680000
     flags = 1
     data = length 32, hash 3BC2F23F
   sample 35:
-    time = 693750
+    time = 700000
     flags = 1
     data = length 32, hash 7ACFCF02
   sample 36:
-    time = 713750
+    time = 720000
     flags = 1
     data = length 32, hash 296A9084
   sample 37:
-    time = 733750
+    time = 740000
     flags = 1
     data = length 32, hash 87B5C8E2
   sample 38:
-    time = 753750
+    time = 760000
     flags = 1
     data = length 32, hash C1C5851
   sample 39:
-    time = 773750
+    time = 780000
     flags = 1
     data = length 32, hash AD17B487
   sample 40:
-    time = 793750
+    time = 800000
     flags = 1
     data = length 32, hash E6806069
   sample 41:
-    time = 813750
+    time = 820000
     flags = 1
     data = length 32, hash AB5007B5
   sample 42:
-    time = 833750
+    time = 840000
     flags = 1
     data = length 32, hash 29DA3044
   sample 43:
-    time = 853750
+    time = 860000
     flags = 1
     data = length 32, hash 680DE283
   sample 44:
-    time = 873750
+    time = 880000
     flags = 1
     data = length 32, hash E5BB6CEF
   sample 45:
-    time = 893750
+    time = 900000
     flags = 1
     data = length 32, hash 654EFBD4
   sample 46:
-    time = 913750
+    time = 920000
     flags = 1
     data = length 32, hash 3BFBC4E5
   sample 47:
-    time = 933750
+    time = 940000
     flags = 1
     data = length 32, hash 10F1217A
   sample 48:
-    time = 953750
+    time = 960000
     flags = 1
     data = length 32, hash E37EF991
   sample 49:
-    time = 973750
+    time = 980000
     flags = 1
     data = length 32, hash 42723B2D
   sample 50:
-    time = 993750
+    time = 1000000
     flags = 1
     data = length 32, hash 2D52F18B
   sample 51:
-    time = 1013750
+    time = 1020000
     flags = 1
     data = length 32, hash 6F62245B
   sample 52:
-    time = 1033750
+    time = 1040000
     flags = 1
     data = length 32, hash BA89ADED
   sample 53:
-    time = 1053750
+    time = 1060000
     flags = 1
     data = length 32, hash FCF8C5E2
   sample 54:
-    time = 1073750
+    time = 1080000
     flags = 1
     data = length 32, hash F9AEEE3D
   sample 55:
-    time = 1093750
+    time = 1100000
     flags = 1
     data = length 32, hash 2E465113
   sample 56:
-    time = 1113750
+    time = 1120000
     flags = 1
     data = length 32, hash 59CF2666
   sample 57:
-    time = 1133750
+    time = 1140000
     flags = 1
     data = length 32, hash 3AB7A8D9
   sample 58:
-    time = 1153750
+    time = 1160000
     flags = 1
     data = length 32, hash EB9D3A8E
   sample 59:
-    time = 1173750
+    time = 1180000
     flags = 1
     data = length 32, hash 6539E15F
   sample 60:
-    time = 1193750
+    time = 1200000
     flags = 1
     data = length 32, hash 2CAB1170
   sample 61:
-    time = 1213750
+    time = 1220000
     flags = 1
     data = length 32, hash D0CA4456
   sample 62:
-    time = 1233750
+    time = 1240000
     flags = 1
     data = length 32, hash DB3DBEE6
   sample 63:
-    time = 1253750
+    time = 1260000
     flags = 1
     data = length 32, hash 6D094AC4
   sample 64:
-    time = 1273750
+    time = 1280000
     flags = 1
     data = length 32, hash 2D6471B
   sample 65:
-    time = 1293750
+    time = 1300000
     flags = 1
     data = length 32, hash 86D257FB
   sample 66:
-    time = 1313750
+    time = 1320000
     flags = 1
     data = length 32, hash D8733063
   sample 67:
-    time = 1333750
+    time = 1340000
     flags = 1
     data = length 32, hash C975C837
   sample 68:
-    time = 1353750
+    time = 1360000
     flags = 1
     data = length 32, hash 2D548A68
   sample 69:
-    time = 1373750
+    time = 1380000
     flags = 1
     data = length 32, hash 7A4907BA
   sample 70:
-    time = 1393750
+    time = 1400000
     flags = 1
     data = length 32, hash 6BDFDEB5
   sample 71:
-    time = 1413750
+    time = 1420000
     flags = 1
     data = length 32, hash 272D422E
   sample 72:
-    time = 1433750
+    time = 1440000
     flags = 1
     data = length 32, hash BBFDCD7B
   sample 73:
-    time = 1453750
+    time = 1460000
     flags = 1
     data = length 32, hash 81F7CBF2
   sample 74:
-    time = 1473750
+    time = 1480000
     flags = 1
     data = length 32, hash C18523A
   sample 75:
-    time = 1493750
+    time = 1500000
     flags = 1
     data = length 32, hash E062FDDB
   sample 76:
-    time = 1513750
+    time = 1520000
     flags = 1
     data = length 32, hash A756C4C8
   sample 77:
-    time = 1533750
+    time = 1540000
     flags = 1
     data = length 32, hash A4FA6865
   sample 78:
-    time = 1553750
+    time = 1560000
     flags = 1
     data = length 32, hash 6BC22B
   sample 79:
-    time = 1573750
+    time = 1580000
     flags = 1
     data = length 32, hash 37041F06
   sample 80:
-    time = 1593750
+    time = 1600000
     flags = 1
     data = length 32, hash A9049020
   sample 81:
-    time = 1613750
+    time = 1620000
     flags = 1
     data = length 32, hash E3C9552A
   sample 82:
-    time = 1633750
+    time = 1640000
     flags = 1
     data = length 32, hash 6EB2559
   sample 83:
-    time = 1653750
+    time = 1660000
     flags = 1
     data = length 32, hash 988FD295
   sample 84:
-    time = 1673750
+    time = 1680000
     flags = 1
     data = length 32, hash 6E0FFFA8
   sample 85:
-    time = 1693750
+    time = 1700000
     flags = 1
     data = length 32, hash 4A16A2E5
   sample 86:
-    time = 1713750
+    time = 1720000
     flags = 1
     data = length 32, hash 8526E110
   sample 87:
-    time = 1733750
+    time = 1740000
     flags = 1
     data = length 32, hash 9C0F881C
   sample 88:
-    time = 1753750
+    time = 1760000
     flags = 1
     data = length 32, hash 68DF67F7
   sample 89:
-    time = 1773750
+    time = 1780000
     flags = 1
     data = length 32, hash A789F088
   sample 90:
-    time = 1793750
+    time = 1800000
     flags = 1
     data = length 32, hash B9CF3A20
   sample 91:
-    time = 1813750
+    time = 1820000
     flags = 1
     data = length 32, hash 2AFD3C01
   sample 92:
-    time = 1833750
+    time = 1840000
     flags = 1
     data = length 32, hash 3F61D3F4
   sample 93:
-    time = 1853750
+    time = 1860000
     flags = 1
     data = length 32, hash 2D210ECA
   sample 94:
-    time = 1873750
+    time = 1880000
     flags = 1
     data = length 32, hash B8143A84
   sample 95:
-    time = 1893750
+    time = 1900000
     flags = 1
     data = length 32, hash FE8EBC16
   sample 96:
-    time = 1913750
+    time = 1920000
     flags = 1
     data = length 32, hash 85A9EE5D
   sample 97:
-    time = 1933750
+    time = 1940000
     flags = 1
     data = length 32, hash 3BDF48D1
   sample 98:
-    time = 1953750
+    time = 1960000
     flags = 1
     data = length 32, hash 8EBCE992
   sample 99:
-    time = 1973750
+    time = 1980000
     flags = 1
     data = length 32, hash B22AFFF
   sample 100:
-    time = 1993750
+    time = 2000000
     flags = 1
     data = length 32, hash 5F01BAC9
   sample 101:
-    time = 2013750
+    time = 2020000
     flags = 1
     data = length 32, hash C6B7BD37
   sample 102:
-    time = 2033750
+    time = 2040000
     flags = 1
     data = length 32, hash 5102216
   sample 103:
-    time = 2053750
+    time = 2060000
     flags = 1
     data = length 32, hash 8FE06144
   sample 104:
-    time = 2073750
+    time = 2080000
     flags = 1
     data = length 32, hash ED90D421
   sample 105:
-    time = 2093750
+    time = 2100000
     flags = 1
     data = length 32, hash 15971BF0
   sample 106:
-    time = 2113750
+    time = 2120000
     flags = 1
     data = length 32, hash 1B2D1ADE
   sample 107:
-    time = 2133750
+    time = 2140000
     flags = 1
     data = length 32, hash A8A54AD2
   sample 108:
-    time = 2153750
+    time = 2160000
     flags = 1
     data = length 32, hash 270646A2
   sample 109:
-    time = 2173750
+    time = 2180000
     flags = 1
     data = length 32, hash 27DB772F
   sample 110:
-    time = 2193750
+    time = 2200000
     flags = 1
     data = length 32, hash FBD3938
   sample 111:
-    time = 2213750
+    time = 2220000
     flags = 1
     data = length 32, hash FA27CAFB
   sample 112:
-    time = 2233750
+    time = 2240000
     flags = 1
     data = length 32, hash 828AB2A4
   sample 113:
-    time = 2253750
+    time = 2260000
     flags = 1
     data = length 32, hash 5788D8F1
   sample 114:
-    time = 2273750
+    time = 2280000
     flags = 1
     data = length 32, hash B7A5AEB0
   sample 115:
-    time = 2293750
+    time = 2300000
     flags = 1
     data = length 32, hash 272DC4BC
   sample 116:
-    time = 2313750
+    time = 2320000
     flags = 1
     data = length 32, hash 56C2540E
   sample 117:
-    time = 2333750
+    time = 2340000
     flags = 1
     data = length 32, hash 3236D8C
   sample 118:
-    time = 2353750
+    time = 2360000
     flags = 1
     data = length 32, hash 6C0650B
   sample 119:
-    time = 2373750
+    time = 2380000
     flags = 1
     data = length 32, hash 1EA3E6C3
   sample 120:
-    time = 2393750
+    time = 2400000
     flags = 1
     data = length 32, hash 6512496C
   sample 121:
-    time = 2413750
+    time = 2420000
     flags = 1
     data = length 32, hash 82CD3C74
   sample 122:
-    time = 2433750
+    time = 2440000
     flags = 1
     data = length 32, hash 7EDFB3A4
   sample 123:
-    time = 2453750
+    time = 2460000
     flags = 1
     data = length 32, hash AAFD22AB
   sample 124:
-    time = 2473750
+    time = 2480000
     flags = 1
     data = length 32, hash 8577D9D1
   sample 125:
-    time = 2493750
+    time = 2500000
     flags = 1
     data = length 32, hash B8A22921
   sample 126:
-    time = 2513750
+    time = 2520000
     flags = 1
     data = length 32, hash 5E4EFC87
   sample 127:
-    time = 2533750
+    time = 2540000
     flags = 1
     data = length 32, hash 35A5463F
   sample 128:
-    time = 2553750
+    time = 2560000
     flags = 1
     data = length 32, hash 3EBC0376
   sample 129:
-    time = 2573750
+    time = 2580000
     flags = 1
     data = length 32, hash F515CB86
   sample 130:
-    time = 2593750
+    time = 2600000
     flags = 1
     data = length 32, hash B113F72C
   sample 131:
-    time = 2613750
+    time = 2620000
     flags = 1
     data = length 32, hash 420AE0
   sample 132:
-    time = 2633750
+    time = 2640000
     flags = 1
     data = length 32, hash 86D53F0F
   sample 133:
-    time = 2653750
+    time = 2660000
     flags = 1
     data = length 32, hash 5600867C
   sample 134:
-    time = 2673750
+    time = 2680000
     flags = 1
     data = length 32, hash EB4D89B6
   sample 135:
-    time = 2693750
+    time = 2700000
     flags = 1
     data = length 32, hash 9BCD0B44
   sample 136:
-    time = 2713750
+    time = 2720000
     flags = 1
     data = length 32, hash 4629F424
   sample 137:
-    time = 2733750
+    time = 2740000
     flags = 1
     data = length 32, hash DFAA65F7
   sample 138:
-    time = 2753750
+    time = 2760000
     flags = 1
     data = length 32, hash 9CF2BD6A
   sample 139:
-    time = 2773750
+    time = 2780000
     flags = 1
     data = length 32, hash 7A36CAB4
   sample 140:
-    time = 2793750
+    time = 2800000
     flags = 1
     data = length 32, hash 1B9BCD43
   sample 141:
-    time = 2813750
+    time = 2820000
     flags = 1
     data = length 32, hash 409B739C
   sample 142:
-    time = 2833750
+    time = 2840000
     flags = 1
     data = length 32, hash 126CAB5A
   sample 143:
-    time = 2853750
+    time = 2860000
     flags = 1
     data = length 32, hash 58173930
   sample 144:
-    time = 2873750
+    time = 2880000
     flags = 1
     data = length 32, hash 32F281F
   sample 145:
-    time = 2893750
+    time = 2900000
     flags = 1
     data = length 32, hash D3F26DE
   sample 146:
-    time = 2913750
+    time = 2920000
     flags = 1
     data = length 32, hash C13BE9A7
   sample 147:
-    time = 2933750
+    time = 2940000
     flags = 1
     data = length 32, hash 854B6181
   sample 148:
-    time = 2953750
+    time = 2960000
     flags = 1
     data = length 32, hash 1E217D84
   sample 149:
-    time = 2973750
+    time = 2980000
     flags = 1
     data = length 32, hash B121F36A
   sample 150:
-    time = 2993750
+    time = 3000000
     flags = 536870913
     data = length 32, hash 67FBC502
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
index 117b95939c..ccd0e67e9b 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
@@ -2,9 +2,9 @@ seekMap:
   isSeekable = true
   duration = 4236600
   getPosition(0) = [[timeUs=0, position=400052]]
-  getPosition(1) = [[timeUs=0, position=400052], [timeUs=1002955, position=2283470]]
-  getPosition(2118300) = [[timeUs=2003566, position=4184649], [timeUs=3003444, position=4426916]]
-  getPosition(4236600) = [[timeUs=4003277, position=6438541]]
+  getPosition(1) = [[timeUs=0, position=400052], [timeUs=1002955, position=430177]]
+  getPosition(2118300) = [[timeUs=2003566, position=2503758], [timeUs=3003444, position=4426916]]
+  getPosition(4236600) = [[timeUs=4003277, position=4459282]]
 numberOfTracks = 2
 track 0:
   total output bytes = 7944083
diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented_box_structure.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented_box_structure.dump
index e8a679b355..90ff783072 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented_box_structure.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented_box_structure.dump
@@ -58,33 +58,33 @@ moov (1209 bytes):
       Data = length 24, hash C35D3183
     trex (32 bytes):
       Data = length 24, hash 14070F84
-moof (2876 bytes):
+moof (2924 bytes):
   mfhd (16 bytes):
     Data = length 8, hash 94446F02
   traf (1132 bytes):
     tfhd (24 bytes):
       Data = length 16, hash D37153D4
     trun (1100 bytes):
-      Data = length 1092, hash 592B69C9
-  traf (1720 bytes):
+      Data = length 1092, hash EB5519F9
+  traf (1768 bytes):
     tfhd (24 bytes):
       Data = length 16, hash 67B5C2D5
-    trun (1688 bytes):
-      Data = length 1680, hash 9B4F1796
-mdat (5712387 bytes):
-  Data = length 5712379, hash 86B2819D
-moof (1244 bytes):
+    trun (1736 bytes):
+      Data = length 1728, hash C23EB3C1
+mdat (5715098 bytes):
+  Data = length 5715090, hash F05D5E74
+moof (1196 bytes):
   mfhd (16 bytes):
     Data = length 8, hash 94446F03
   traf (496 bytes):
     tfhd (24 bytes):
-      Data = length 16, hash D372A134
+      Data = length 16, hash D372A231
     trun (464 bytes):
-      Data = length 456, hash 42DBA357
-  traf (724 bytes):
+      Data = length 456, hash 8DE68B27
+  traf (676 bytes):
     tfhd (24 bytes):
-      Data = length 16, hash 67B71035
-    trun (692 bytes):
-      Data = length 684, hash 478B10C2
-mdat (2364921 bytes):
-  Data = length 2364913, hash D363A845
+      Data = length 16, hash 67B71132
+    trun (644 bytes):
+      Data = length 636, hash B5F6D197
+mdat (2362210 bytes):
+  Data = length 2362202, hash 99EB8832
diff --git a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
index 1752e8f219..b224d331b3 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
@@ -2,9 +2,9 @@ seekMap:
   isSeekable = true
   duration = 4171700
   getPosition(0) = [[timeUs=0, position=400052]]
-  getPosition(1) = [[timeUs=0, position=400052], [timeUs=1002955, position=2283470]]
-  getPosition(2085850) = [[timeUs=2003566, position=4184649], [timeUs=3003444, position=4426916]]
-  getPosition(4171700) = [[timeUs=4003277, position=6438541]]
+  getPosition(1) = [[timeUs=0, position=400052], [timeUs=1002955, position=430177]]
+  getPosition(2085850) = [[timeUs=2003566, position=2503758], [timeUs=3003444, position=4426916]]
+  getPosition(4171700) = [[timeUs=4003277, position=4459282]]
 numberOfTracks = 2
 track 0:
   total output bytes = 7822354
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
index 38a28611f8..67f1e4d28c 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
@@ -2,9 +2,9 @@ seekMap:
   isSeekable = true
   duration = 4236600
   getPosition(0) = [[timeUs=0, position=44]]
-  getPosition(1) = [[timeUs=0, position=44], [timeUs=1002955, position=1913587]]
-  getPosition(2118300) = [[timeUs=2003566, position=3814151], [timeUs=3003444, position=5711758]]
-  getPosition(4236600) = [[timeUs=4003277, position=7609538]]
+  getPosition(1) = [[timeUs=0, position=44], [timeUs=1002955, position=30169]]
+  getPosition(2118300) = [[timeUs=2003566, position=2162805], [timeUs=3003444, position=4026908]]
+  getPosition(4236600) = [[timeUs=4003277, position=5970225]]
 numberOfTracks = 2
 track 0:
   total output bytes = 7944083
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
index 3be5335140..cb3b0a5c13 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
@@ -2,9 +2,9 @@ seekMap:
   isSeekable = true
   duration = 4236600
   getPosition(0) = [[timeUs=0, position=400052]]
-  getPosition(1) = [[timeUs=0, position=400052], [timeUs=1002955, position=2313595]]
-  getPosition(2118300) = [[timeUs=2003566, position=4214159], [timeUs=3003444, position=6111766]]
-  getPosition(4236600) = [[timeUs=4003277, position=8009546]]
+  getPosition(1) = [[timeUs=0, position=400052], [timeUs=1002955, position=430177]]
+  getPosition(2118300) = [[timeUs=2003566, position=2562813], [timeUs=3003444, position=4426916]]
+  getPosition(4236600) = [[timeUs=4003277, position=6370233]]
 numberOfTracks = 2
 track 0:
   total output bytes = 7944083