diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
index d4aa7517ba..6a573dd967 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
@@ -1723,12 +1723,11 @@ import java.util.List;
         // See ISO_IEC_23008-3;2022 MHADecoderConfigurationRecord
         // The header consists of: size (4), boxtype 'mhaC' (4), configurationVersion (1),
         // mpegh3daProfileLevelIndication (1), referenceChannelLayout (1), mpegh3daConfigLength (2).
-        int mhacHeaderSize = 13;
         parent.setPosition(childPosition + Atom.HEADER_SIZE);
-        int configurationVersion = parent.readUnsignedByte();
+        parent.skipBytes(1); // configurationVersion
         int mpeghProfileLevelIndication = parent.readUnsignedByte();
-        int mpeghReferenceChannelLayout = parent.readUnsignedByte();
-        if (mimeType.equals(MimeTypes.AUDIO_MPEGH_MHM1)) {
+        parent.skipBytes(1); // mpeghReferenceChannelLayout
+        if (MimeTypes.AUDIO_MPEGH_MHM1.equals(mimeType)) {
           codecs = String.format("mhm1.%02X", mpeghProfileLevelIndication);
         } else {
           codecs = String.format("mha1.%02X", mpeghProfileLevelIndication);
@@ -1747,7 +1746,6 @@ import java.util.List;
       } else if (childAtomType == Atom.TYPE_mhaP) {
         // See ISO_IEC_23008-3;2022 MHAProfileAndLevelCompatibilitySetBox
         // The header consists of: size (4), boxtype 'mhaP' (4), numCompatibleSets (1).
-        int mhapHeaderSize = 9;
         parent.setPosition(childPosition + Atom.HEADER_SIZE);
         int numCompatibleSets = parent.readUnsignedByte();
         if (numCompatibleSets > 0) {
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump
index 061238c48d..4d4738271b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189787000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 60, hash C05CBBFC
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump
index 061238c48d..4d4738271b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189787000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 60, hash C05CBBFC
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump
index c970e640e5..b9f19aea49 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189787000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 60, hash C05CBBFC
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump
index c970e640e5..b9f19aea49 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189787000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 60, hash C05CBBFC
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump
index 061238c48d..4d4738271b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189787000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 60, hash C05CBBFC
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump
index fb61fab254..e9804a7c26 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189743000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982001, modification time=3780982001, timescale=600]
     initializationData:
       data = length 64, hash DB1F936C
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump
index cc10b5e943..f37c37d996 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189743000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982001, modification time=3780982001, timescale=600]
     initializationData:
       data = length 64, hash DB1F936C
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump
index 2e022c6246..5248df28f4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189743000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982001, modification time=3780982001, timescale=600]
     initializationData:
       data = length 64, hash DB1F936C
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump
index 6d68e91793..3278f168d3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189743000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982001, modification time=3780982001, timescale=600]
     initializationData:
       data = length 64, hash DB1F936C
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump
index fb61fab254..e9804a7c26 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189743000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982001, modification time=3780982001, timescale=600]
     initializationData:
       data = length 64, hash DB1F936C
   sample 0:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump
index 302fda3a31..3ec36c107d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189788000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 63, hash 82D00145
       data = length 1, hash 2F
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump
index 302fda3a31..3ec36c107d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189788000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 63, hash 82D00145
       data = length 1, hash 2F
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump
index fdc89c6f62..a718d28847 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189788000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 63, hash 82D00145
       data = length 1, hash 2F
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump
index fdc89c6f62..a718d28847 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189788000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 63, hash 82D00145
       data = length 1, hash 2F
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump
index 302fda3a31..3ec36c107d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump
@@ -17,7 +17,7 @@ track 0:
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189788000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982024, modification time=3780982024, timescale=600]
     initializationData:
       data = length 63, hash 82D00145
       data = length 1, hash 2F
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump
index 8b54f84aa6..0fc4009c9c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump
@@ -1,595 +1,596 @@
 seekMap:
   isSeekable = true
   duration = 3000000
-  getPosition(0) = [[timeUs=0, position=1286]]
-  getPosition(1) = [[timeUs=1, position=1286]]
-  getPosition(1500000) = [[timeUs=1500000, position=25275]]
-  getPosition(3000000) = [[timeUs=3000000, position=236167]]
+  getPosition(0) = [[timeUs=0, position=1299]]
+  getPosition(1) = [[timeUs=1, position=1299]]
+  getPosition(1500000) = [[timeUs=1500000, position=13294]]
+  getPosition(3000000) = [[timeUs=3000000, position=118734]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 256334
+  total output bytes = 128279
   sample count = 143
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
-    codecs = mhm1.10
-    maxInputSize = 4126
+    codecs = mhm1.0B
+    maxInputSize = 2078
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189744000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982002, modification time=3780982002, timescale=600]
     initializationData:
-      data = length 64, hash 7A6EA64F
+      data = length 67, hash 3CF14937
+      data = length 1, hash 2F
   sample 0:
     time = 0
     flags = 1
-    data = length 620, hash 6EDA7757
+    data = length 488, hash 1ED69C37
   sample 1:
     time = 21333
     flags = 0
-    data = length 204, hash 96F91771
+    data = length 164, hash 136B1B66
   sample 2:
     time = 42666
     flags = 0
-    data = length 202, hash DB12DFC8
+    data = length 158, hash A9289DCD
   sample 3:
     time = 64000
     flags = 0
-    data = length 339, hash 72DE92AC
+    data = length 164, hash 7E2368C3
   sample 4:
     time = 85333
     flags = 0
-    data = length 342, hash FD3E7470
+    data = length 158, hash 10AC2CD4
   sample 5:
     time = 106666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash 22E84AF0
   sample 6:
     time = 128000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 7:
     time = 149333
     flags = 0
-    data = length 342, hash FD3E7475
+    data = length 158, hash 10AC2CD4
   sample 8:
     time = 170666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 158, hash BA6B7094
   sample 9:
     time = 192000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 10:
     time = 213333
     flags = 0
-    data = length 342, hash FD3E747B
+    data = length 158, hash 10AC2CD4
   sample 11:
     time = 234666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash A9289DCC
   sample 12:
     time = 256000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 13:
     time = 277333
     flags = 0
-    data = length 342, hash FD3E7474
+    data = length 158, hash 10AC2CD4
   sample 14:
     time = 298666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 158, hash A9289DCD
   sample 15:
     time = 320000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 16:
     time = 341333
     flags = 0
-    data = length 342, hash FD3E7462
+    data = length 158, hash 10AC2CD4
   sample 17:
     time = 362666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash 37B039B1
   sample 18:
     time = 384000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 19:
     time = 405333
     flags = 0
-    data = length 342, hash FD3E746B
+    data = length 158, hash 10AC2CD4
   sample 20:
     time = 426666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash 37B039AC
   sample 21:
     time = 448000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 22:
     time = 469333
     flags = 0
-    data = length 342, hash 63A0363E
+    data = length 159, hash 95787660
   sample 23:
     time = 490666
     flags = 0
-    data = length 341, hash 51F65393
+    data = length 161, hash 16788957
   sample 24:
     time = 512000
     flags = 1
-    data = length 577, hash 32D21653
+    data = length 494, hash 760CFF0D
   sample 25:
     time = 533333
     flags = 0
-    data = length 197, hash CB0DB412
+    data = length 158, hash 10AC2CD4
   sample 26:
     time = 554666
     flags = 0
-    data = length 250, hash 9BDE48D4
+    data = length 158, hash BA6B70A1
   sample 27:
     time = 576000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 28:
     time = 597333
     flags = 0
-    data = length 342, hash FD3E7476
+    data = length 158, hash 10AC2CD4
   sample 29:
     time = 618666
     flags = 0
-    data = length 341, hash D0034AAE
+    data = length 158, hash BA6B709B
   sample 30:
     time = 640000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 31:
     time = 661333
     flags = 0
-    data = length 342, hash FD3E7464
+    data = length 158, hash 10AC2CD4
   sample 32:
     time = 682666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash BA6B70A5
   sample 33:
     time = 704000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 34:
     time = 725333
     flags = 0
-    data = length 342, hash FD3E7468
+    data = length 158, hash 10AC2CD4
   sample 35:
     time = 746666
     flags = 0
-    data = length 341, hash D0034AAE
+    data = length 158, hash BA6B708A
   sample 36:
     time = 768000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 37:
     time = 789333
     flags = 0
-    data = length 342, hash FD3E746B
+    data = length 158, hash 10AC2CD4
   sample 38:
     time = 810666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 133, hash 1CC194C2
   sample 39:
     time = 832000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 137, hash AED0A139
   sample 40:
     time = 853333
     flags = 0
-    data = length 342, hash FD3E747C
+    data = length 138, hash DC4D2879
   sample 41:
     time = 874666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 118, hash B83EEC69
   sample 42:
     time = 896000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 163, hash 9C0874EC
   sample 43:
     time = 917333
     flags = 0
-    data = length 342, hash FD3E747F
+    data = length 157, hash CB2B0DA9
   sample 44:
     time = 938666
     flags = 0
-    data = length 341, hash D0034AAE
+    data = length 157, hash 5DEF94E6
   sample 45:
     time = 960000
     flags = 0
-    data = length 357, hash 790D09FE
+    data = length 199, hash 95B42394
   sample 46:
     time = 981333
     flags = 0
-    data = length 472, hash 6A997000
+    data = length 212, hash 16161E7E
   sample 47:
     time = 1000000
     flags = 1
-    data = length 3908, hash CDC05E32
+    data = length 1889, hash 4CBC0E10
   sample 48:
     time = 1002666
     flags = 0
-    data = length 3892, hash FB47D264
+    data = length 1946, hash 7CBAD516
   sample 49:
     time = 1024000
     flags = 1
-    data = length 3892, hash 76D5402B
+    data = length 1943, hash 107D8B89
   sample 50:
     time = 1045333
     flags = 0
-    data = length 3892, hash 99AE1080
+    data = length 1946, hash 7ACED7E4
   sample 51:
     time = 1066666
     flags = 0
-    data = length 3892, hash 7DA3A5B7
+    data = length 1946, hash E699F72C
   sample 52:
     time = 1088000
     flags = 0
-    data = length 3892, hash 886247CE
+    data = length 1946, hash EDE7C070
   sample 53:
     time = 1109333
     flags = 0
-    data = length 3892, hash 99AE1077
+    data = length 1946, hash 7ACED7E4
   sample 54:
     time = 1130666
     flags = 0
-    data = length 3892, hash 7DA3A5E0
+    data = length 1946, hash E699F72E
   sample 55:
     time = 1152000
     flags = 0
-    data = length 3892, hash 886247BA
+    data = length 1946, hash EDE7C06D
   sample 56:
     time = 1173333
     flags = 0
-    data = length 3892, hash 99AE106D
+    data = length 1946, hash 7ACED7E4
   sample 57:
     time = 1194666
     flags = 0
-    data = length 3892, hash 7DA3A5CD
+    data = length 1946, hash E699F737
   sample 58:
     time = 1216000
     flags = 0
-    data = length 3892, hash 886247CA
+    data = length 1946, hash EDE7C06F
   sample 59:
     time = 1237333
     flags = 0
-    data = length 3892, hash 99AE1079
+    data = length 1946, hash 7ACED7E4
   sample 60:
     time = 1258666
     flags = 0
-    data = length 3892, hash 7DA3A5D1
+    data = length 1946, hash E699F72D
   sample 61:
     time = 1280000
     flags = 0
-    data = length 3892, hash 886247BD
+    data = length 1946, hash EDE7C070
   sample 62:
     time = 1301333
     flags = 0
-    data = length 3892, hash 99AE106D
+    data = length 1946, hash 7ACED7E4
   sample 63:
     time = 1322666
     flags = 0
-    data = length 3892, hash 7DA3A5A7
+    data = length 1946, hash E699F731
   sample 64:
     time = 1344000
     flags = 0
-    data = length 3892, hash 886247C5
+    data = length 1946, hash EDE7C06E
   sample 65:
     time = 1365333
     flags = 0
-    data = length 3980, hash 8DF782E
+    data = length 1990, hash 8176E8F8
   sample 66:
     time = 1386666
     flags = 0
-    data = length 4096, hash 6C926695
+    data = length 2048, hash 409F44AB
   sample 67:
     time = 1408000
     flags = 0
-    data = length 4096, hash BFCBCEDC
+    data = length 2048, hash 5431547E
   sample 68:
     time = 1429333
     flags = 0
-    data = length 4096, hash 886C00CF
+    data = length 2048, hash 1193639E
   sample 69:
     time = 1450666
     flags = 0
-    data = length 4096, hash 6C92668B
+    data = length 2048, hash 409F44AD
   sample 70:
     time = 1472000
     flags = 0
-    data = length 4096, hash BFCBCEC6
+    data = length 2048, hash 5431547F
   sample 71:
     time = 1493333
     flags = 0
-    data = length 4096, hash E431EAA2
+    data = length 2048, hash 184105C3
   sample 72:
     time = 1514666
     flags = 0
-    data = length 4096, hash 21C24AE1
+    data = length 2048, hash 8308185C
   sample 73:
     time = 1536000
     flags = 1
-    data = length 4096, hash 884E3535
+    data = length 2045, hash CDE033BF
   sample 74:
     time = 1557333
     flags = 0
-    data = length 4096, hash 886C00CE
+    data = length 2048, hash 1193639E
   sample 75:
     time = 1578666
     flags = 0
-    data = length 4096, hash 6C926678
+    data = length 2048, hash 409F44B3
   sample 76:
     time = 1600000
     flags = 0
-    data = length 4096, hash BFCBCEC1
+    data = length 2048, hash 5431547E
   sample 77:
     time = 1621333
     flags = 0
-    data = length 4096, hash 886C00B5
+    data = length 2048, hash 1193639D
   sample 78:
     time = 1642666
     flags = 0
-    data = length 4096, hash 6C926680
+    data = length 2048, hash 409F44B3
   sample 79:
     time = 1664000
     flags = 0
-    data = length 4096, hash BFCBCECA
+    data = length 2048, hash 5431547E
   sample 80:
     time = 1685333
     flags = 0
-    data = length 4096, hash 886C00C4
+    data = length 2048, hash 1193639D
   sample 81:
     time = 1706666
     flags = 0
-    data = length 4096, hash 6C9266A3
+    data = length 2048, hash 409F44AA
   sample 82:
     time = 1728000
     flags = 0
-    data = length 4096, hash BFCBCECB
+    data = length 2048, hash 5431547F
   sample 83:
     time = 1749333
     flags = 0
-    data = length 4096, hash 886C00B9
+    data = length 2048, hash 1193639D
   sample 84:
     time = 1770666
     flags = 0
-    data = length 4096, hash 6C926673
+    data = length 2048, hash 409F44AC
   sample 85:
     time = 1792000
     flags = 0
-    data = length 4096, hash BFCBCEDF
+    data = length 2048, hash 5431547E
   sample 86:
     time = 1813333
     flags = 0
-    data = length 4096, hash 886C00C8
+    data = length 2048, hash 1193639D
   sample 87:
     time = 1834666
     flags = 0
-    data = length 4096, hash 6C926684
+    data = length 2048, hash 409F44AE
   sample 88:
     time = 1856000
     flags = 0
-    data = length 4096, hash BFCBCEDD
+    data = length 2048, hash 5431547D
   sample 89:
     time = 1877333
     flags = 0
-    data = length 4096, hash 886C00B2
+    data = length 2048, hash 1193639E
   sample 90:
     time = 1898666
     flags = 0
-    data = length 4096, hash 6C926684
+    data = length 2048, hash 409F44B6
   sample 91:
     time = 1920000
     flags = 0
-    data = length 4096, hash BFCBCEDA
+    data = length 2048, hash 5431547F
   sample 92:
     time = 1941333
     flags = 0
-    data = length 4096, hash 886C00C7
+    data = length 2048, hash 1193639E
   sample 93:
     time = 1962666
     flags = 0
-    data = length 4096, hash AFF7C654
+    data = length 2048, hash 9C157230
   sample 94:
     time = 1984000
     flags = 0
-    data = length 3892, hash 7B3EC7FD
+    data = length 1946, hash 4A0BC4F0
   sample 95:
     time = 2000000
     flags = 1
-    data = length 764, hash B77EB08E
+    data = length 747, hash 825A1CE1
   sample 96:
     time = 2005333
     flags = 0
-    data = length 413, hash A778FC60
+    data = length 238, hash DA502A4F
   sample 97:
     time = 2026666
     flags = 0
-    data = length 973, hash 21498BD8
+    data = length 324, hash A76C55FD
   sample 98:
     time = 2048000
     flags = 1
-    data = length 973, hash 66EB9A28
+    data = length 814, hash BB697ADA
   sample 99:
     time = 2069333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 299, hash 90B92023
   sample 100:
     time = 2090666
     flags = 0
-    data = length 973, hash B888BDB6
+    data = length 319, hash 5F47ED6D
   sample 101:
     time = 2112000
     flags = 0
-    data = length 973, hash 52B402A
+    data = length 295, hash E35C19E
   sample 102:
     time = 2133333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 475, hash 5C915E92
   sample 103:
     time = 2154666
     flags = 0
-    data = length 973, hash B888BE0C
+    data = length 487, hash CB0F60F6
   sample 104:
     time = 2176000
     flags = 0
-    data = length 973, hash 52B4028
+    data = length 487, hash 4FFB63CA
   sample 105:
     time = 2197333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57C
   sample 106:
     time = 2218666
     flags = 0
-    data = length 973, hash B888BDDA
+    data = length 487, hash CB0F611B
   sample 107:
     time = 2240000
     flags = 0
-    data = length 973, hash 52B4016
+    data = length 487, hash 4FFB6392
   sample 108:
     time = 2261333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57D
   sample 109:
     time = 2282666
     flags = 0
-    data = length 973, hash B888BDBD
+    data = length 487, hash CB0F60C9
   sample 110:
     time = 2304000
     flags = 0
-    data = length 973, hash 52B406C
+    data = length 487, hash 4FFB63CB
   sample 111:
     time = 2325333
     flags = 0
-    data = length 1021, hash 2C16D82E
+    data = length 503, hash 56E1AE8B
   sample 112:
     time = 2346666
     flags = 0
-    data = length 1024, hash 64B5D698
+    data = length 512, hash 12E1C0A8
   sample 113:
     time = 2368000
     flags = 0
-    data = length 1024, hash 6084A5F9
+    data = length 512, hash 4C28784B
   sample 114:
     time = 2389333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422AB9
   sample 115:
     time = 2410666
     flags = 0
-    data = length 1024, hash 64B5D68B
+    data = length 512, hash 12E1C076
   sample 116:
     time = 2432000
     flags = 0
-    data = length 1024, hash 6084A645
+    data = length 512, hash 4C287892
   sample 117:
     time = 2453333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 118:
     time = 2474666
     flags = 0
-    data = length 1024, hash 64B5D6CD
+    data = length 512, hash 12E1C0B9
   sample 119:
     time = 2496000
     flags = 0
-    data = length 1024, hash 6084A632
+    data = length 512, hash 4C28789F
   sample 120:
     time = 2517333
     flags = 0
-    data = length 1024, hash 9990F104
+    data = length 512, hash ED501283
   sample 121:
     time = 2538666
     flags = 0
-    data = length 1024, hash 828D7A4
+    data = length 512, hash 9D4174B7
   sample 122:
     time = 2560000
     flags = 1
-    data = length 1024, hash 1F972702
+    data = length 817, hash 7CFB77D9
   sample 123:
     time = 2581333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 299, hash 90B9202B
   sample 124:
     time = 2602666
     flags = 0
-    data = length 1024, hash 64B5D6DB
+    data = length 420, hash 7C4664C0
   sample 125:
     time = 2624000
     flags = 0
-    data = length 1024, hash 6084A61E
+    data = length 512, hash 4C287858
   sample 126:
     time = 2645333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 127:
     time = 2666666
     flags = 0
-    data = length 1024, hash 64B5D6A9
+    data = length 512, hash 12E1C05A
   sample 128:
     time = 2688000
     flags = 0
-    data = length 1024, hash 6084A625
+    data = length 512, hash 4C287822
   sample 129:
     time = 2709333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 130:
     time = 2730666
     flags = 0
-    data = length 1024, hash 64B5D6CA
+    data = length 512, hash 12E1C097
   sample 131:
     time = 2752000
     flags = 0
-    data = length 1024, hash 6084A5E2
+    data = length 512, hash 4C28783B
   sample 132:
     time = 2773333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABC
   sample 133:
     time = 2794666
     flags = 0
-    data = length 1024, hash 64B5D66B
+    data = length 512, hash 12E1C088
   sample 134:
     time = 2816000
     flags = 0
-    data = length 1024, hash 6084A629
+    data = length 512, hash 4C28786A
   sample 135:
     time = 2837333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABA
   sample 136:
     time = 2858666
     flags = 0
-    data = length 1024, hash 64B5D6B4
+    data = length 512, hash 12E1C05D
   sample 137:
     time = 2880000
     flags = 0
-    data = length 1024, hash 6084A627
+    data = length 512, hash 4C287851
   sample 138:
     time = 2901333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 139:
     time = 2922666
     flags = 0
-    data = length 1024, hash 64B5D6B5
+    data = length 512, hash 12E1C09A
   sample 140:
     time = 2944000
     flags = 0
-    data = length 1024, hash 6084A61D
+    data = length 512, hash 4C28782A
   sample 141:
     time = 2965333
     flags = 0
-    data = length 1024, hash 5A1932E8
+    data = length 604, hash 5CC9EA3F
   sample 142:
     time = 2986666
     flags = 536870912
-    data = length 973, hash 9C376715
+    data = length 512, hash C97A4FD2
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump
index 2f4f9f62db..db53cdbbf7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump
@@ -1,407 +1,408 @@
 seekMap:
   isSeekable = true
   duration = 3000000
-  getPosition(0) = [[timeUs=0, position=1286]]
-  getPosition(1) = [[timeUs=1, position=1286]]
-  getPosition(1500000) = [[timeUs=1500000, position=25275]]
-  getPosition(3000000) = [[timeUs=3000000, position=236167]]
+  getPosition(0) = [[timeUs=0, position=1299]]
+  getPosition(1) = [[timeUs=1, position=1299]]
+  getPosition(1500000) = [[timeUs=1500000, position=13294]]
+  getPosition(3000000) = [[timeUs=3000000, position=118734]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 240145
+  total output bytes = 120119
   sample count = 96
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
-    codecs = mhm1.10
-    maxInputSize = 4126
+    codecs = mhm1.0B
+    maxInputSize = 2078
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189744000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982002, modification time=3780982002, timescale=600]
     initializationData:
-      data = length 64, hash 7A6EA64F
+      data = length 67, hash 3CF14937
+      data = length 1, hash 2F
   sample 0:
     time = 1000000
     flags = 1
-    data = length 3908, hash CDC05E32
+    data = length 1889, hash 4CBC0E10
   sample 1:
     time = 1002666
     flags = 0
-    data = length 3892, hash FB47D264
+    data = length 1946, hash 7CBAD516
   sample 2:
     time = 1024000
     flags = 1
-    data = length 3892, hash 76D5402B
+    data = length 1943, hash 107D8B89
   sample 3:
     time = 1045333
     flags = 0
-    data = length 3892, hash 99AE1080
+    data = length 1946, hash 7ACED7E4
   sample 4:
     time = 1066666
     flags = 0
-    data = length 3892, hash 7DA3A5B7
+    data = length 1946, hash E699F72C
   sample 5:
     time = 1088000
     flags = 0
-    data = length 3892, hash 886247CE
+    data = length 1946, hash EDE7C070
   sample 6:
     time = 1109333
     flags = 0
-    data = length 3892, hash 99AE1077
+    data = length 1946, hash 7ACED7E4
   sample 7:
     time = 1130666
     flags = 0
-    data = length 3892, hash 7DA3A5E0
+    data = length 1946, hash E699F72E
   sample 8:
     time = 1152000
     flags = 0
-    data = length 3892, hash 886247BA
+    data = length 1946, hash EDE7C06D
   sample 9:
     time = 1173333
     flags = 0
-    data = length 3892, hash 99AE106D
+    data = length 1946, hash 7ACED7E4
   sample 10:
     time = 1194666
     flags = 0
-    data = length 3892, hash 7DA3A5CD
+    data = length 1946, hash E699F737
   sample 11:
     time = 1216000
     flags = 0
-    data = length 3892, hash 886247CA
+    data = length 1946, hash EDE7C06F
   sample 12:
     time = 1237333
     flags = 0
-    data = length 3892, hash 99AE1079
+    data = length 1946, hash 7ACED7E4
   sample 13:
     time = 1258666
     flags = 0
-    data = length 3892, hash 7DA3A5D1
+    data = length 1946, hash E699F72D
   sample 14:
     time = 1280000
     flags = 0
-    data = length 3892, hash 886247BD
+    data = length 1946, hash EDE7C070
   sample 15:
     time = 1301333
     flags = 0
-    data = length 3892, hash 99AE106D
+    data = length 1946, hash 7ACED7E4
   sample 16:
     time = 1322666
     flags = 0
-    data = length 3892, hash 7DA3A5A7
+    data = length 1946, hash E699F731
   sample 17:
     time = 1344000
     flags = 0
-    data = length 3892, hash 886247C5
+    data = length 1946, hash EDE7C06E
   sample 18:
     time = 1365333
     flags = 0
-    data = length 3980, hash 8DF782E
+    data = length 1990, hash 8176E8F8
   sample 19:
     time = 1386666
     flags = 0
-    data = length 4096, hash 6C926695
+    data = length 2048, hash 409F44AB
   sample 20:
     time = 1408000
     flags = 0
-    data = length 4096, hash BFCBCEDC
+    data = length 2048, hash 5431547E
   sample 21:
     time = 1429333
     flags = 0
-    data = length 4096, hash 886C00CF
+    data = length 2048, hash 1193639E
   sample 22:
     time = 1450666
     flags = 0
-    data = length 4096, hash 6C92668B
+    data = length 2048, hash 409F44AD
   sample 23:
     time = 1472000
     flags = 0
-    data = length 4096, hash BFCBCEC6
+    data = length 2048, hash 5431547F
   sample 24:
     time = 1493333
     flags = 0
-    data = length 4096, hash E431EAA2
+    data = length 2048, hash 184105C3
   sample 25:
     time = 1514666
     flags = 0
-    data = length 4096, hash 21C24AE1
+    data = length 2048, hash 8308185C
   sample 26:
     time = 1536000
     flags = 1
-    data = length 4096, hash 884E3535
+    data = length 2045, hash CDE033BF
   sample 27:
     time = 1557333
     flags = 0
-    data = length 4096, hash 886C00CE
+    data = length 2048, hash 1193639E
   sample 28:
     time = 1578666
     flags = 0
-    data = length 4096, hash 6C926678
+    data = length 2048, hash 409F44B3
   sample 29:
     time = 1600000
     flags = 0
-    data = length 4096, hash BFCBCEC1
+    data = length 2048, hash 5431547E
   sample 30:
     time = 1621333
     flags = 0
-    data = length 4096, hash 886C00B5
+    data = length 2048, hash 1193639D
   sample 31:
     time = 1642666
     flags = 0
-    data = length 4096, hash 6C926680
+    data = length 2048, hash 409F44B3
   sample 32:
     time = 1664000
     flags = 0
-    data = length 4096, hash BFCBCECA
+    data = length 2048, hash 5431547E
   sample 33:
     time = 1685333
     flags = 0
-    data = length 4096, hash 886C00C4
+    data = length 2048, hash 1193639D
   sample 34:
     time = 1706666
     flags = 0
-    data = length 4096, hash 6C9266A3
+    data = length 2048, hash 409F44AA
   sample 35:
     time = 1728000
     flags = 0
-    data = length 4096, hash BFCBCECB
+    data = length 2048, hash 5431547F
   sample 36:
     time = 1749333
     flags = 0
-    data = length 4096, hash 886C00B9
+    data = length 2048, hash 1193639D
   sample 37:
     time = 1770666
     flags = 0
-    data = length 4096, hash 6C926673
+    data = length 2048, hash 409F44AC
   sample 38:
     time = 1792000
     flags = 0
-    data = length 4096, hash BFCBCEDF
+    data = length 2048, hash 5431547E
   sample 39:
     time = 1813333
     flags = 0
-    data = length 4096, hash 886C00C8
+    data = length 2048, hash 1193639D
   sample 40:
     time = 1834666
     flags = 0
-    data = length 4096, hash 6C926684
+    data = length 2048, hash 409F44AE
   sample 41:
     time = 1856000
     flags = 0
-    data = length 4096, hash BFCBCEDD
+    data = length 2048, hash 5431547D
   sample 42:
     time = 1877333
     flags = 0
-    data = length 4096, hash 886C00B2
+    data = length 2048, hash 1193639E
   sample 43:
     time = 1898666
     flags = 0
-    data = length 4096, hash 6C926684
+    data = length 2048, hash 409F44B6
   sample 44:
     time = 1920000
     flags = 0
-    data = length 4096, hash BFCBCEDA
+    data = length 2048, hash 5431547F
   sample 45:
     time = 1941333
     flags = 0
-    data = length 4096, hash 886C00C7
+    data = length 2048, hash 1193639E
   sample 46:
     time = 1962666
     flags = 0
-    data = length 4096, hash AFF7C654
+    data = length 2048, hash 9C157230
   sample 47:
     time = 1984000
     flags = 0
-    data = length 3892, hash 7B3EC7FD
+    data = length 1946, hash 4A0BC4F0
   sample 48:
     time = 2000000
     flags = 1
-    data = length 764, hash B77EB08E
+    data = length 747, hash 825A1CE1
   sample 49:
     time = 2005333
     flags = 0
-    data = length 413, hash A778FC60
+    data = length 238, hash DA502A4F
   sample 50:
     time = 2026666
     flags = 0
-    data = length 973, hash 21498BD8
+    data = length 324, hash A76C55FD
   sample 51:
     time = 2048000
     flags = 1
-    data = length 973, hash 66EB9A28
+    data = length 814, hash BB697ADA
   sample 52:
     time = 2069333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 299, hash 90B92023
   sample 53:
     time = 2090666
     flags = 0
-    data = length 973, hash B888BDB6
+    data = length 319, hash 5F47ED6D
   sample 54:
     time = 2112000
     flags = 0
-    data = length 973, hash 52B402A
+    data = length 295, hash E35C19E
   sample 55:
     time = 2133333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 475, hash 5C915E92
   sample 56:
     time = 2154666
     flags = 0
-    data = length 973, hash B888BE0C
+    data = length 487, hash CB0F60F6
   sample 57:
     time = 2176000
     flags = 0
-    data = length 973, hash 52B4028
+    data = length 487, hash 4FFB63CA
   sample 58:
     time = 2197333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57C
   sample 59:
     time = 2218666
     flags = 0
-    data = length 973, hash B888BDDA
+    data = length 487, hash CB0F611B
   sample 60:
     time = 2240000
     flags = 0
-    data = length 973, hash 52B4016
+    data = length 487, hash 4FFB6392
   sample 61:
     time = 2261333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57D
   sample 62:
     time = 2282666
     flags = 0
-    data = length 973, hash B888BDBD
+    data = length 487, hash CB0F60C9
   sample 63:
     time = 2304000
     flags = 0
-    data = length 973, hash 52B406C
+    data = length 487, hash 4FFB63CB
   sample 64:
     time = 2325333
     flags = 0
-    data = length 1021, hash 2C16D82E
+    data = length 503, hash 56E1AE8B
   sample 65:
     time = 2346666
     flags = 0
-    data = length 1024, hash 64B5D698
+    data = length 512, hash 12E1C0A8
   sample 66:
     time = 2368000
     flags = 0
-    data = length 1024, hash 6084A5F9
+    data = length 512, hash 4C28784B
   sample 67:
     time = 2389333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422AB9
   sample 68:
     time = 2410666
     flags = 0
-    data = length 1024, hash 64B5D68B
+    data = length 512, hash 12E1C076
   sample 69:
     time = 2432000
     flags = 0
-    data = length 1024, hash 6084A645
+    data = length 512, hash 4C287892
   sample 70:
     time = 2453333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 71:
     time = 2474666
     flags = 0
-    data = length 1024, hash 64B5D6CD
+    data = length 512, hash 12E1C0B9
   sample 72:
     time = 2496000
     flags = 0
-    data = length 1024, hash 6084A632
+    data = length 512, hash 4C28789F
   sample 73:
     time = 2517333
     flags = 0
-    data = length 1024, hash 9990F104
+    data = length 512, hash ED501283
   sample 74:
     time = 2538666
     flags = 0
-    data = length 1024, hash 828D7A4
+    data = length 512, hash 9D4174B7
   sample 75:
     time = 2560000
     flags = 1
-    data = length 1024, hash 1F972702
+    data = length 817, hash 7CFB77D9
   sample 76:
     time = 2581333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 299, hash 90B9202B
   sample 77:
     time = 2602666
     flags = 0
-    data = length 1024, hash 64B5D6DB
+    data = length 420, hash 7C4664C0
   sample 78:
     time = 2624000
     flags = 0
-    data = length 1024, hash 6084A61E
+    data = length 512, hash 4C287858
   sample 79:
     time = 2645333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 80:
     time = 2666666
     flags = 0
-    data = length 1024, hash 64B5D6A9
+    data = length 512, hash 12E1C05A
   sample 81:
     time = 2688000
     flags = 0
-    data = length 1024, hash 6084A625
+    data = length 512, hash 4C287822
   sample 82:
     time = 2709333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 83:
     time = 2730666
     flags = 0
-    data = length 1024, hash 64B5D6CA
+    data = length 512, hash 12E1C097
   sample 84:
     time = 2752000
     flags = 0
-    data = length 1024, hash 6084A5E2
+    data = length 512, hash 4C28783B
   sample 85:
     time = 2773333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABC
   sample 86:
     time = 2794666
     flags = 0
-    data = length 1024, hash 64B5D66B
+    data = length 512, hash 12E1C088
   sample 87:
     time = 2816000
     flags = 0
-    data = length 1024, hash 6084A629
+    data = length 512, hash 4C28786A
   sample 88:
     time = 2837333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABA
   sample 89:
     time = 2858666
     flags = 0
-    data = length 1024, hash 64B5D6B4
+    data = length 512, hash 12E1C05D
   sample 90:
     time = 2880000
     flags = 0
-    data = length 1024, hash 6084A627
+    data = length 512, hash 4C287851
   sample 91:
     time = 2901333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 92:
     time = 2922666
     flags = 0
-    data = length 1024, hash 64B5D6B5
+    data = length 512, hash 12E1C09A
   sample 93:
     time = 2944000
     flags = 0
-    data = length 1024, hash 6084A61D
+    data = length 512, hash 4C28782A
   sample 94:
     time = 2965333
     flags = 0
-    data = length 1024, hash 5A1932E8
+    data = length 604, hash 5CC9EA3F
   sample 95:
     time = 2986666
     flags = 536870912
-    data = length 973, hash 9C376715
+    data = length 512, hash C97A4FD2
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump
index c8a319bc81..3f4deb8ba1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump
@@ -1,215 +1,216 @@
 seekMap:
   isSeekable = true
   duration = 3000000
-  getPosition(0) = [[timeUs=0, position=1286]]
-  getPosition(1) = [[timeUs=1, position=1286]]
-  getPosition(1500000) = [[timeUs=1500000, position=25275]]
-  getPosition(3000000) = [[timeUs=3000000, position=236167]]
+  getPosition(0) = [[timeUs=0, position=1299]]
+  getPosition(1) = [[timeUs=1, position=1299]]
+  getPosition(1500000) = [[timeUs=1500000, position=13294]]
+  getPosition(3000000) = [[timeUs=3000000, position=118734]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 47513
+  total output bytes = 23874
   sample count = 48
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
-    codecs = mhm1.10
-    maxInputSize = 4126
+    codecs = mhm1.0B
+    maxInputSize = 2078
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189744000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982002, modification time=3780982002, timescale=600]
     initializationData:
-      data = length 64, hash 7A6EA64F
+      data = length 67, hash 3CF14937
+      data = length 1, hash 2F
   sample 0:
     time = 2000000
     flags = 1
-    data = length 764, hash B77EB08E
+    data = length 747, hash 825A1CE1
   sample 1:
     time = 2005333
     flags = 0
-    data = length 413, hash A778FC60
+    data = length 238, hash DA502A4F
   sample 2:
     time = 2026666
     flags = 0
-    data = length 973, hash 21498BD8
+    data = length 324, hash A76C55FD
   sample 3:
     time = 2048000
     flags = 1
-    data = length 973, hash 66EB9A28
+    data = length 814, hash BB697ADA
   sample 4:
     time = 2069333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 299, hash 90B92023
   sample 5:
     time = 2090666
     flags = 0
-    data = length 973, hash B888BDB6
+    data = length 319, hash 5F47ED6D
   sample 6:
     time = 2112000
     flags = 0
-    data = length 973, hash 52B402A
+    data = length 295, hash E35C19E
   sample 7:
     time = 2133333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 475, hash 5C915E92
   sample 8:
     time = 2154666
     flags = 0
-    data = length 973, hash B888BE0C
+    data = length 487, hash CB0F60F6
   sample 9:
     time = 2176000
     flags = 0
-    data = length 973, hash 52B4028
+    data = length 487, hash 4FFB63CA
   sample 10:
     time = 2197333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57C
   sample 11:
     time = 2218666
     flags = 0
-    data = length 973, hash B888BDDA
+    data = length 487, hash CB0F611B
   sample 12:
     time = 2240000
     flags = 0
-    data = length 973, hash 52B4016
+    data = length 487, hash 4FFB6392
   sample 13:
     time = 2261333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57D
   sample 14:
     time = 2282666
     flags = 0
-    data = length 973, hash B888BDBD
+    data = length 487, hash CB0F60C9
   sample 15:
     time = 2304000
     flags = 0
-    data = length 973, hash 52B406C
+    data = length 487, hash 4FFB63CB
   sample 16:
     time = 2325333
     flags = 0
-    data = length 1021, hash 2C16D82E
+    data = length 503, hash 56E1AE8B
   sample 17:
     time = 2346666
     flags = 0
-    data = length 1024, hash 64B5D698
+    data = length 512, hash 12E1C0A8
   sample 18:
     time = 2368000
     flags = 0
-    data = length 1024, hash 6084A5F9
+    data = length 512, hash 4C28784B
   sample 19:
     time = 2389333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422AB9
   sample 20:
     time = 2410666
     flags = 0
-    data = length 1024, hash 64B5D68B
+    data = length 512, hash 12E1C076
   sample 21:
     time = 2432000
     flags = 0
-    data = length 1024, hash 6084A645
+    data = length 512, hash 4C287892
   sample 22:
     time = 2453333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 23:
     time = 2474666
     flags = 0
-    data = length 1024, hash 64B5D6CD
+    data = length 512, hash 12E1C0B9
   sample 24:
     time = 2496000
     flags = 0
-    data = length 1024, hash 6084A632
+    data = length 512, hash 4C28789F
   sample 25:
     time = 2517333
     flags = 0
-    data = length 1024, hash 9990F104
+    data = length 512, hash ED501283
   sample 26:
     time = 2538666
     flags = 0
-    data = length 1024, hash 828D7A4
+    data = length 512, hash 9D4174B7
   sample 27:
     time = 2560000
     flags = 1
-    data = length 1024, hash 1F972702
+    data = length 817, hash 7CFB77D9
   sample 28:
     time = 2581333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 299, hash 90B9202B
   sample 29:
     time = 2602666
     flags = 0
-    data = length 1024, hash 64B5D6DB
+    data = length 420, hash 7C4664C0
   sample 30:
     time = 2624000
     flags = 0
-    data = length 1024, hash 6084A61E
+    data = length 512, hash 4C287858
   sample 31:
     time = 2645333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 32:
     time = 2666666
     flags = 0
-    data = length 1024, hash 64B5D6A9
+    data = length 512, hash 12E1C05A
   sample 33:
     time = 2688000
     flags = 0
-    data = length 1024, hash 6084A625
+    data = length 512, hash 4C287822
   sample 34:
     time = 2709333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 35:
     time = 2730666
     flags = 0
-    data = length 1024, hash 64B5D6CA
+    data = length 512, hash 12E1C097
   sample 36:
     time = 2752000
     flags = 0
-    data = length 1024, hash 6084A5E2
+    data = length 512, hash 4C28783B
   sample 37:
     time = 2773333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABC
   sample 38:
     time = 2794666
     flags = 0
-    data = length 1024, hash 64B5D66B
+    data = length 512, hash 12E1C088
   sample 39:
     time = 2816000
     flags = 0
-    data = length 1024, hash 6084A629
+    data = length 512, hash 4C28786A
   sample 40:
     time = 2837333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABA
   sample 41:
     time = 2858666
     flags = 0
-    data = length 1024, hash 64B5D6B4
+    data = length 512, hash 12E1C05D
   sample 42:
     time = 2880000
     flags = 0
-    data = length 1024, hash 6084A627
+    data = length 512, hash 4C287851
   sample 43:
     time = 2901333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 44:
     time = 2922666
     flags = 0
-    data = length 1024, hash 64B5D6B5
+    data = length 512, hash 12E1C09A
   sample 45:
     time = 2944000
     flags = 0
-    data = length 1024, hash 6084A61D
+    data = length 512, hash 4C28782A
   sample 46:
     time = 2965333
     flags = 0
-    data = length 1024, hash 5A1932E8
+    data = length 604, hash 5CC9EA3F
   sample 47:
     time = 2986666
     flags = 536870912
-    data = length 973, hash 9C376715
+    data = length 512, hash C97A4FD2
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump
index 4e0220eff9..8a5db2942e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump
@@ -1,107 +1,108 @@
 seekMap:
   isSeekable = true
   duration = 3000000
-  getPosition(0) = [[timeUs=0, position=1286]]
-  getPosition(1) = [[timeUs=1, position=1286]]
-  getPosition(1500000) = [[timeUs=1500000, position=25275]]
-  getPosition(3000000) = [[timeUs=3000000, position=236167]]
+  getPosition(0) = [[timeUs=0, position=1299]]
+  getPosition(1) = [[timeUs=1, position=1299]]
+  getPosition(1500000) = [[timeUs=1500000, position=13294]]
+  getPosition(3000000) = [[timeUs=3000000, position=118734]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 21453
+  total output bytes = 10844
   sample count = 21
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
-    codecs = mhm1.10
-    maxInputSize = 4126
+    codecs = mhm1.0B
+    maxInputSize = 2078
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189744000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982002, modification time=3780982002, timescale=600]
     initializationData:
-      data = length 64, hash 7A6EA64F
+      data = length 67, hash 3CF14937
+      data = length 1, hash 2F
   sample 0:
     time = 2560000
     flags = 1
-    data = length 1024, hash 1F972702
+    data = length 817, hash 7CFB77D9
   sample 1:
     time = 2581333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 299, hash 90B9202B
   sample 2:
     time = 2602666
     flags = 0
-    data = length 1024, hash 64B5D6DB
+    data = length 420, hash 7C4664C0
   sample 3:
     time = 2624000
     flags = 0
-    data = length 1024, hash 6084A61E
+    data = length 512, hash 4C287858
   sample 4:
     time = 2645333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 5:
     time = 2666666
     flags = 0
-    data = length 1024, hash 64B5D6A9
+    data = length 512, hash 12E1C05A
   sample 6:
     time = 2688000
     flags = 0
-    data = length 1024, hash 6084A625
+    data = length 512, hash 4C287822
   sample 7:
     time = 2709333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 8:
     time = 2730666
     flags = 0
-    data = length 1024, hash 64B5D6CA
+    data = length 512, hash 12E1C097
   sample 9:
     time = 2752000
     flags = 0
-    data = length 1024, hash 6084A5E2
+    data = length 512, hash 4C28783B
   sample 10:
     time = 2773333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABC
   sample 11:
     time = 2794666
     flags = 0
-    data = length 1024, hash 64B5D66B
+    data = length 512, hash 12E1C088
   sample 12:
     time = 2816000
     flags = 0
-    data = length 1024, hash 6084A629
+    data = length 512, hash 4C28786A
   sample 13:
     time = 2837333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABA
   sample 14:
     time = 2858666
     flags = 0
-    data = length 1024, hash 64B5D6B4
+    data = length 512, hash 12E1C05D
   sample 15:
     time = 2880000
     flags = 0
-    data = length 1024, hash 6084A627
+    data = length 512, hash 4C287851
   sample 16:
     time = 2901333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 17:
     time = 2922666
     flags = 0
-    data = length 1024, hash 64B5D6B5
+    data = length 512, hash 12E1C09A
   sample 18:
     time = 2944000
     flags = 0
-    data = length 1024, hash 6084A61D
+    data = length 512, hash 4C28782A
   sample 19:
     time = 2965333
     flags = 0
-    data = length 1024, hash 5A1932E8
+    data = length 604, hash 5CC9EA3F
   sample 20:
     time = 2986666
     flags = 536870912
-    data = length 973, hash 9C376715
+    data = length 512, hash C97A4FD2
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump
index 8b54f84aa6..0fc4009c9c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump
@@ -1,595 +1,596 @@
 seekMap:
   isSeekable = true
   duration = 3000000
-  getPosition(0) = [[timeUs=0, position=1286]]
-  getPosition(1) = [[timeUs=1, position=1286]]
-  getPosition(1500000) = [[timeUs=1500000, position=25275]]
-  getPosition(3000000) = [[timeUs=3000000, position=236167]]
+  getPosition(0) = [[timeUs=0, position=1299]]
+  getPosition(1) = [[timeUs=1, position=1299]]
+  getPosition(1500000) = [[timeUs=1500000, position=13294]]
+  getPosition(3000000) = [[timeUs=3000000, position=118734]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 256334
+  total output bytes = 128279
   sample count = 143
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
-    codecs = mhm1.10
-    maxInputSize = 4126
+    codecs = mhm1.0B
+    maxInputSize = 2078
     channelCount = 0
     sampleRate = 48000
     language = und
-    metadata = entries=[Creation time: 1697189744000]
+    metadata = entries=[Mp4Timestamp: creation time=3780982002, modification time=3780982002, timescale=600]
     initializationData:
-      data = length 64, hash 7A6EA64F
+      data = length 67, hash 3CF14937
+      data = length 1, hash 2F
   sample 0:
     time = 0
     flags = 1
-    data = length 620, hash 6EDA7757
+    data = length 488, hash 1ED69C37
   sample 1:
     time = 21333
     flags = 0
-    data = length 204, hash 96F91771
+    data = length 164, hash 136B1B66
   sample 2:
     time = 42666
     flags = 0
-    data = length 202, hash DB12DFC8
+    data = length 158, hash A9289DCD
   sample 3:
     time = 64000
     flags = 0
-    data = length 339, hash 72DE92AC
+    data = length 164, hash 7E2368C3
   sample 4:
     time = 85333
     flags = 0
-    data = length 342, hash FD3E7470
+    data = length 158, hash 10AC2CD4
   sample 5:
     time = 106666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash 22E84AF0
   sample 6:
     time = 128000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 7:
     time = 149333
     flags = 0
-    data = length 342, hash FD3E7475
+    data = length 158, hash 10AC2CD4
   sample 8:
     time = 170666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 158, hash BA6B7094
   sample 9:
     time = 192000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 10:
     time = 213333
     flags = 0
-    data = length 342, hash FD3E747B
+    data = length 158, hash 10AC2CD4
   sample 11:
     time = 234666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash A9289DCC
   sample 12:
     time = 256000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 13:
     time = 277333
     flags = 0
-    data = length 342, hash FD3E7474
+    data = length 158, hash 10AC2CD4
   sample 14:
     time = 298666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 158, hash A9289DCD
   sample 15:
     time = 320000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 16:
     time = 341333
     flags = 0
-    data = length 342, hash FD3E7462
+    data = length 158, hash 10AC2CD4
   sample 17:
     time = 362666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash 37B039B1
   sample 18:
     time = 384000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 19:
     time = 405333
     flags = 0
-    data = length 342, hash FD3E746B
+    data = length 158, hash 10AC2CD4
   sample 20:
     time = 426666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash 37B039AC
   sample 21:
     time = 448000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 22:
     time = 469333
     flags = 0
-    data = length 342, hash 63A0363E
+    data = length 159, hash 95787660
   sample 23:
     time = 490666
     flags = 0
-    data = length 341, hash 51F65393
+    data = length 161, hash 16788957
   sample 24:
     time = 512000
     flags = 1
-    data = length 577, hash 32D21653
+    data = length 494, hash 760CFF0D
   sample 25:
     time = 533333
     flags = 0
-    data = length 197, hash CB0DB412
+    data = length 158, hash 10AC2CD4
   sample 26:
     time = 554666
     flags = 0
-    data = length 250, hash 9BDE48D4
+    data = length 158, hash BA6B70A1
   sample 27:
     time = 576000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 28:
     time = 597333
     flags = 0
-    data = length 342, hash FD3E7476
+    data = length 158, hash 10AC2CD4
   sample 29:
     time = 618666
     flags = 0
-    data = length 341, hash D0034AAE
+    data = length 158, hash BA6B709B
   sample 30:
     time = 640000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 31:
     time = 661333
     flags = 0
-    data = length 342, hash FD3E7464
+    data = length 158, hash 10AC2CD4
   sample 32:
     time = 682666
     flags = 0
-    data = length 341, hash D0034AB0
+    data = length 158, hash BA6B70A5
   sample 33:
     time = 704000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 34:
     time = 725333
     flags = 0
-    data = length 342, hash FD3E7468
+    data = length 158, hash 10AC2CD4
   sample 35:
     time = 746666
     flags = 0
-    data = length 341, hash D0034AAE
+    data = length 158, hash BA6B708A
   sample 36:
     time = 768000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 164, hash 7E2368C3
   sample 37:
     time = 789333
     flags = 0
-    data = length 342, hash FD3E746B
+    data = length 158, hash 10AC2CD4
   sample 38:
     time = 810666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 133, hash 1CC194C2
   sample 39:
     time = 832000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 137, hash AED0A139
   sample 40:
     time = 853333
     flags = 0
-    data = length 342, hash FD3E747C
+    data = length 138, hash DC4D2879
   sample 41:
     time = 874666
     flags = 0
-    data = length 341, hash D0034AB1
+    data = length 118, hash B83EEC69
   sample 42:
     time = 896000
     flags = 0
-    data = length 341, hash A3075A48
+    data = length 163, hash 9C0874EC
   sample 43:
     time = 917333
     flags = 0
-    data = length 342, hash FD3E747F
+    data = length 157, hash CB2B0DA9
   sample 44:
     time = 938666
     flags = 0
-    data = length 341, hash D0034AAE
+    data = length 157, hash 5DEF94E6
   sample 45:
     time = 960000
     flags = 0
-    data = length 357, hash 790D09FE
+    data = length 199, hash 95B42394
   sample 46:
     time = 981333
     flags = 0
-    data = length 472, hash 6A997000
+    data = length 212, hash 16161E7E
   sample 47:
     time = 1000000
     flags = 1
-    data = length 3908, hash CDC05E32
+    data = length 1889, hash 4CBC0E10
   sample 48:
     time = 1002666
     flags = 0
-    data = length 3892, hash FB47D264
+    data = length 1946, hash 7CBAD516
   sample 49:
     time = 1024000
     flags = 1
-    data = length 3892, hash 76D5402B
+    data = length 1943, hash 107D8B89
   sample 50:
     time = 1045333
     flags = 0
-    data = length 3892, hash 99AE1080
+    data = length 1946, hash 7ACED7E4
   sample 51:
     time = 1066666
     flags = 0
-    data = length 3892, hash 7DA3A5B7
+    data = length 1946, hash E699F72C
   sample 52:
     time = 1088000
     flags = 0
-    data = length 3892, hash 886247CE
+    data = length 1946, hash EDE7C070
   sample 53:
     time = 1109333
     flags = 0
-    data = length 3892, hash 99AE1077
+    data = length 1946, hash 7ACED7E4
   sample 54:
     time = 1130666
     flags = 0
-    data = length 3892, hash 7DA3A5E0
+    data = length 1946, hash E699F72E
   sample 55:
     time = 1152000
     flags = 0
-    data = length 3892, hash 886247BA
+    data = length 1946, hash EDE7C06D
   sample 56:
     time = 1173333
     flags = 0
-    data = length 3892, hash 99AE106D
+    data = length 1946, hash 7ACED7E4
   sample 57:
     time = 1194666
     flags = 0
-    data = length 3892, hash 7DA3A5CD
+    data = length 1946, hash E699F737
   sample 58:
     time = 1216000
     flags = 0
-    data = length 3892, hash 886247CA
+    data = length 1946, hash EDE7C06F
   sample 59:
     time = 1237333
     flags = 0
-    data = length 3892, hash 99AE1079
+    data = length 1946, hash 7ACED7E4
   sample 60:
     time = 1258666
     flags = 0
-    data = length 3892, hash 7DA3A5D1
+    data = length 1946, hash E699F72D
   sample 61:
     time = 1280000
     flags = 0
-    data = length 3892, hash 886247BD
+    data = length 1946, hash EDE7C070
   sample 62:
     time = 1301333
     flags = 0
-    data = length 3892, hash 99AE106D
+    data = length 1946, hash 7ACED7E4
   sample 63:
     time = 1322666
     flags = 0
-    data = length 3892, hash 7DA3A5A7
+    data = length 1946, hash E699F731
   sample 64:
     time = 1344000
     flags = 0
-    data = length 3892, hash 886247C5
+    data = length 1946, hash EDE7C06E
   sample 65:
     time = 1365333
     flags = 0
-    data = length 3980, hash 8DF782E
+    data = length 1990, hash 8176E8F8
   sample 66:
     time = 1386666
     flags = 0
-    data = length 4096, hash 6C926695
+    data = length 2048, hash 409F44AB
   sample 67:
     time = 1408000
     flags = 0
-    data = length 4096, hash BFCBCEDC
+    data = length 2048, hash 5431547E
   sample 68:
     time = 1429333
     flags = 0
-    data = length 4096, hash 886C00CF
+    data = length 2048, hash 1193639E
   sample 69:
     time = 1450666
     flags = 0
-    data = length 4096, hash 6C92668B
+    data = length 2048, hash 409F44AD
   sample 70:
     time = 1472000
     flags = 0
-    data = length 4096, hash BFCBCEC6
+    data = length 2048, hash 5431547F
   sample 71:
     time = 1493333
     flags = 0
-    data = length 4096, hash E431EAA2
+    data = length 2048, hash 184105C3
   sample 72:
     time = 1514666
     flags = 0
-    data = length 4096, hash 21C24AE1
+    data = length 2048, hash 8308185C
   sample 73:
     time = 1536000
     flags = 1
-    data = length 4096, hash 884E3535
+    data = length 2045, hash CDE033BF
   sample 74:
     time = 1557333
     flags = 0
-    data = length 4096, hash 886C00CE
+    data = length 2048, hash 1193639E
   sample 75:
     time = 1578666
     flags = 0
-    data = length 4096, hash 6C926678
+    data = length 2048, hash 409F44B3
   sample 76:
     time = 1600000
     flags = 0
-    data = length 4096, hash BFCBCEC1
+    data = length 2048, hash 5431547E
   sample 77:
     time = 1621333
     flags = 0
-    data = length 4096, hash 886C00B5
+    data = length 2048, hash 1193639D
   sample 78:
     time = 1642666
     flags = 0
-    data = length 4096, hash 6C926680
+    data = length 2048, hash 409F44B3
   sample 79:
     time = 1664000
     flags = 0
-    data = length 4096, hash BFCBCECA
+    data = length 2048, hash 5431547E
   sample 80:
     time = 1685333
     flags = 0
-    data = length 4096, hash 886C00C4
+    data = length 2048, hash 1193639D
   sample 81:
     time = 1706666
     flags = 0
-    data = length 4096, hash 6C9266A3
+    data = length 2048, hash 409F44AA
   sample 82:
     time = 1728000
     flags = 0
-    data = length 4096, hash BFCBCECB
+    data = length 2048, hash 5431547F
   sample 83:
     time = 1749333
     flags = 0
-    data = length 4096, hash 886C00B9
+    data = length 2048, hash 1193639D
   sample 84:
     time = 1770666
     flags = 0
-    data = length 4096, hash 6C926673
+    data = length 2048, hash 409F44AC
   sample 85:
     time = 1792000
     flags = 0
-    data = length 4096, hash BFCBCEDF
+    data = length 2048, hash 5431547E
   sample 86:
     time = 1813333
     flags = 0
-    data = length 4096, hash 886C00C8
+    data = length 2048, hash 1193639D
   sample 87:
     time = 1834666
     flags = 0
-    data = length 4096, hash 6C926684
+    data = length 2048, hash 409F44AE
   sample 88:
     time = 1856000
     flags = 0
-    data = length 4096, hash BFCBCEDD
+    data = length 2048, hash 5431547D
   sample 89:
     time = 1877333
     flags = 0
-    data = length 4096, hash 886C00B2
+    data = length 2048, hash 1193639E
   sample 90:
     time = 1898666
     flags = 0
-    data = length 4096, hash 6C926684
+    data = length 2048, hash 409F44B6
   sample 91:
     time = 1920000
     flags = 0
-    data = length 4096, hash BFCBCEDA
+    data = length 2048, hash 5431547F
   sample 92:
     time = 1941333
     flags = 0
-    data = length 4096, hash 886C00C7
+    data = length 2048, hash 1193639E
   sample 93:
     time = 1962666
     flags = 0
-    data = length 4096, hash AFF7C654
+    data = length 2048, hash 9C157230
   sample 94:
     time = 1984000
     flags = 0
-    data = length 3892, hash 7B3EC7FD
+    data = length 1946, hash 4A0BC4F0
   sample 95:
     time = 2000000
     flags = 1
-    data = length 764, hash B77EB08E
+    data = length 747, hash 825A1CE1
   sample 96:
     time = 2005333
     flags = 0
-    data = length 413, hash A778FC60
+    data = length 238, hash DA502A4F
   sample 97:
     time = 2026666
     flags = 0
-    data = length 973, hash 21498BD8
+    data = length 324, hash A76C55FD
   sample 98:
     time = 2048000
     flags = 1
-    data = length 973, hash 66EB9A28
+    data = length 814, hash BB697ADA
   sample 99:
     time = 2069333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 299, hash 90B92023
   sample 100:
     time = 2090666
     flags = 0
-    data = length 973, hash B888BDB6
+    data = length 319, hash 5F47ED6D
   sample 101:
     time = 2112000
     flags = 0
-    data = length 973, hash 52B402A
+    data = length 295, hash E35C19E
   sample 102:
     time = 2133333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 475, hash 5C915E92
   sample 103:
     time = 2154666
     flags = 0
-    data = length 973, hash B888BE0C
+    data = length 487, hash CB0F60F6
   sample 104:
     time = 2176000
     flags = 0
-    data = length 973, hash 52B4028
+    data = length 487, hash 4FFB63CA
   sample 105:
     time = 2197333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57C
   sample 106:
     time = 2218666
     flags = 0
-    data = length 973, hash B888BDDA
+    data = length 487, hash CB0F611B
   sample 107:
     time = 2240000
     flags = 0
-    data = length 973, hash 52B4016
+    data = length 487, hash 4FFB6392
   sample 108:
     time = 2261333
     flags = 0
-    data = length 973, hash EA24022E
+    data = length 487, hash 97A7C57D
   sample 109:
     time = 2282666
     flags = 0
-    data = length 973, hash B888BDBD
+    data = length 487, hash CB0F60C9
   sample 110:
     time = 2304000
     flags = 0
-    data = length 973, hash 52B406C
+    data = length 487, hash 4FFB63CB
   sample 111:
     time = 2325333
     flags = 0
-    data = length 1021, hash 2C16D82E
+    data = length 503, hash 56E1AE8B
   sample 112:
     time = 2346666
     flags = 0
-    data = length 1024, hash 64B5D698
+    data = length 512, hash 12E1C0A8
   sample 113:
     time = 2368000
     flags = 0
-    data = length 1024, hash 6084A5F9
+    data = length 512, hash 4C28784B
   sample 114:
     time = 2389333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422AB9
   sample 115:
     time = 2410666
     flags = 0
-    data = length 1024, hash 64B5D68B
+    data = length 512, hash 12E1C076
   sample 116:
     time = 2432000
     flags = 0
-    data = length 1024, hash 6084A645
+    data = length 512, hash 4C287892
   sample 117:
     time = 2453333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 118:
     time = 2474666
     flags = 0
-    data = length 1024, hash 64B5D6CD
+    data = length 512, hash 12E1C0B9
   sample 119:
     time = 2496000
     flags = 0
-    data = length 1024, hash 6084A632
+    data = length 512, hash 4C28789F
   sample 120:
     time = 2517333
     flags = 0
-    data = length 1024, hash 9990F104
+    data = length 512, hash ED501283
   sample 121:
     time = 2538666
     flags = 0
-    data = length 1024, hash 828D7A4
+    data = length 512, hash 9D4174B7
   sample 122:
     time = 2560000
     flags = 1
-    data = length 1024, hash 1F972702
+    data = length 817, hash 7CFB77D9
   sample 123:
     time = 2581333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 299, hash 90B9202B
   sample 124:
     time = 2602666
     flags = 0
-    data = length 1024, hash 64B5D6DB
+    data = length 420, hash 7C4664C0
   sample 125:
     time = 2624000
     flags = 0
-    data = length 1024, hash 6084A61E
+    data = length 512, hash 4C287858
   sample 126:
     time = 2645333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 127:
     time = 2666666
     flags = 0
-    data = length 1024, hash 64B5D6A9
+    data = length 512, hash 12E1C05A
   sample 128:
     time = 2688000
     flags = 0
-    data = length 1024, hash 6084A625
+    data = length 512, hash 4C287822
   sample 129:
     time = 2709333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABB
   sample 130:
     time = 2730666
     flags = 0
-    data = length 1024, hash 64B5D6CA
+    data = length 512, hash 12E1C097
   sample 131:
     time = 2752000
     flags = 0
-    data = length 1024, hash 6084A5E2
+    data = length 512, hash 4C28783B
   sample 132:
     time = 2773333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABC
   sample 133:
     time = 2794666
     flags = 0
-    data = length 1024, hash 64B5D66B
+    data = length 512, hash 12E1C088
   sample 134:
     time = 2816000
     flags = 0
-    data = length 1024, hash 6084A629
+    data = length 512, hash 4C28786A
   sample 135:
     time = 2837333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABA
   sample 136:
     time = 2858666
     flags = 0
-    data = length 1024, hash 64B5D6B4
+    data = length 512, hash 12E1C05D
   sample 137:
     time = 2880000
     flags = 0
-    data = length 1024, hash 6084A627
+    data = length 512, hash 4C287851
   sample 138:
     time = 2901333
     flags = 0
-    data = length 1024, hash 3D9FA477
+    data = length 512, hash 71422ABF
   sample 139:
     time = 2922666
     flags = 0
-    data = length 1024, hash 64B5D6B5
+    data = length 512, hash 12E1C09A
   sample 140:
     time = 2944000
     flags = 0
-    data = length 1024, hash 6084A61D
+    data = length 512, hash 4C28782A
   sample 141:
     time = 2965333
     flags = 0
-    data = length 1024, hash 5A1932E8
+    data = length 604, hash 5CC9EA3F
   sample 142:
     time = 2986666
     flags = 536870912
-    data = length 973, hash 9C376715
+    data = length 512, hash C97A4FD2
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1.mp4
index c9cec56405..b15603ea86 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1.mp4 differ
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1_fragmented.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1_fragmented.mp4
index 94a81a5f19..15fff41a51 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1_fragmented.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_cicp1_fragmented.mp4 differ
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange.mp4
index 981fb72a80..275513e09c 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange.mp4 differ
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange_fragmented.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange_fragmented.mp4
index 97f5e586d5..1c3f411348 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange_fragmented.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_bl_configchange_fragmented.mp4 differ
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1.mp4
index fd0066ed20..e7b540ce2d 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1.mp4 differ
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4
index 270d8c38f8..df07587f00 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4 differ
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange.mp4
index 233930aefd..b703f4bad1 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange.mp4 differ
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4
index e551f787c1..0e897e03a9 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4 differ