diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
index 9c05e188de..aae61d4db8 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
@@ -1680,11 +1680,11 @@ public final class BoxParser {
     return colorInfo.build();
   }
 
-  // TODO(Internal: b/375329008):  Add a published spec link of APV codec to the Javadoc.
   /**
    * Parses the apvC configuration record and returns a {@link ColorInfo} from its data.
    *
-   * <p>See apvC configuration record syntax from the spec.
+   * <p>See apvC configuration record syntax from the <a
+   * href="https://github.com/openapv/openapv/blob/main/readme/apv_isobmff.md#syntax-1">spec</a>.
    *
    * <p>The sections referenced in the method are from this spec.
    *
@@ -1695,34 +1695,34 @@ public final class BoxParser {
     ColorInfo.Builder colorInfo = new ColorInfo.Builder();
     ParsableBitArray bitArray = new ParsableBitArray(data.getData());
     bitArray.setPosition(data.getPosition() * 8); // Convert byte to bit position.
-
-    // See Section 2.2.3, APVDecoderConfigurationBox.
-    bitArray.skipBits(6); // configurationVersion
-    boolean isStaticFrameHeader = bitArray.readBit(); // static_frame_header
-    bitArray.skipBit(); // capture_time_distance_ignored
-
-    // Skip largest_frame_header_size (2 bytes), largest_profile_idc (1 byte), largest_level_idc (1
-    // byte), largest_frame_width_minus1 (4 bytes), largest_frame_height_minus1 (4 bytes)
-    bitArray.skipBytes(12);
-    bitArray.skipBits(4); // largest_chromat_format_idc
-
-    int bitDepth = bitArray.readBits(4) + 8; // largest_bit_depth_minus8 + 8
-    colorInfo.setLumaBitdepth(bitDepth);
-    colorInfo.setChromaBitdepth(bitDepth);
-    bitArray.skipBits(8); // largest_capture_time_distance
-
-    if (isStaticFrameHeader) {
-      bitArray.skipBits(7); // reserved_zero_7bits
-      if (!bitArray.readBit()) { // frame_header_repeated
+    bitArray.skipBytes(4); // skip version and flag (4 bytes)
+    // See APVDecoderConfigurationBox syntax.
+    bitArray.skipBytes(1); // configurationVersion
+    int numConfigurationEntries = bitArray.readBits(8); // number_of_configuration_entry
+    for (int i = 0; i < numConfigurationEntries; i++) {
+      bitArray.skipBytes(1); // pbu_type
+      int numberOfFrameInfo = bitArray.readBits(8);
+      for (int j = 0; j < numberOfFrameInfo; j++) {
         bitArray.skipBits(6); // reserved_zero_6bits
         boolean isColorDescriptionPresent =
             bitArray.readBit(); // color_description_present_flag_info
-        bitArray.skipBit(); // use_q_matrix_info
+        bitArray.skipBit(); // capture_time_distance_ignored
+        // Skip profile_idc (1 byte), level_idc (1 byte), band_idc (1 byte), frame_width (4 bytes),
+        // frame_height (4 bytes).
+        bitArray.skipBytes(11);
+        bitArray.skipBits(4); // chroma_format_idc (4 bits)
+        int bitDepth = bitArray.readBits(4) + 8; // bit_depth_minus8 + 8
+        colorInfo.setLumaBitdepth(bitDepth);
+        colorInfo.setChromaBitdepth(bitDepth);
+        bitArray.skipBytes(1); // capture_time_distance
         if (isColorDescriptionPresent) {
           int colorPrimaries = bitArray.readBits(8); // color_primaries
           int transferCharacteristics = bitArray.readBits(8); // transfer_characteristics
+          bitArray.skipBytes(1); // matrix_coefficients
+          boolean fullRangeFlag = bitArray.readBit(); // full_range_flag
           colorInfo
               .setColorSpace(ColorInfo.isoColorPrimariesToColorSpace(colorPrimaries))
+              .setColorRange(fullRangeFlag ? C.COLOR_RANGE_FULL : C.COLOR_RANGE_LIMITED)
               .setColorTransfer(
                   ColorInfo.isoTransferCharacteristicsToColorTransfer(transferCharacteristics));
         }
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump
index 93f15e3c66..9de0f5f46a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump
@@ -2,526 +2,526 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 4277755
+  total output bytes = 8455938
   sample count = 125
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 0
     flags = 1
-    data = length 46291, hash F184D3EA
+    data = length 52373, hash 80FDAE9B
   sample 1:
     time = 33333
     flags = 1
-    data = length 45054, hash F206D4C7
+    data = length 53098, hash 15BB3540
   sample 2:
     time = 66666
     flags = 1
-    data = length 43917, hash 41AF8999
+    data = length 54177, hash 461C0D61
   sample 3:
     time = 100000
     flags = 1
-    data = length 42718, hash 3133C7AA
+    data = length 54942, hash 8AF2C3DA
   sample 4:
     time = 133333
     flags = 1
-    data = length 42073, hash 65FC45EF
+    data = length 55605, hash 988F3C3D
   sample 5:
     time = 166666
     flags = 1
-    data = length 41038, hash 7BD21D86
+    data = length 56867, hash A1C39A74
   sample 6:
     time = 200000
     flags = 1
-    data = length 40179, hash 9BCCCD79
+    data = length 57618, hash CC4751E6
   sample 7:
     time = 233333
     flags = 1
-    data = length 38738, hash B3D91D1B
+    data = length 58225, hash 53620F5C
   sample 8:
     time = 266666
     flags = 1
-    data = length 38176, hash FD0085E7
+    data = length 58799, hash 9C33BFA
   sample 9:
     time = 300000
     flags = 1
-    data = length 37326, hash 306F7E88
+    data = length 58973, hash 8C133C85
   sample 10:
     time = 333333
     flags = 1
-    data = length 36940, hash EE677695
+    data = length 59706, hash 9EE847FF
   sample 11:
     time = 366666
     flags = 1
-    data = length 36320, hash 3FCF3B37
+    data = length 60245, hash DCF1B3D6
   sample 12:
     time = 400000
     flags = 1
-    data = length 35664, hash A5C0C7CB
+    data = length 60813, hash 85E99B5D
   sample 13:
     time = 433333
     flags = 1
-    data = length 35666, hash F54C69A5
+    data = length 61121, hash 2F0AD0E6
   sample 14:
     time = 466666
     flags = 1
-    data = length 35300, hash 77430247
+    data = length 61587, hash 653FBFA1
   sample 15:
     time = 500000
     flags = 1
-    data = length 34693, hash BF72F842
+    data = length 61580, hash 7CD613C3
   sample 16:
     time = 533333
     flags = 1
-    data = length 34708, hash 881A49B1
+    data = length 62189, hash F965EBB5
   sample 17:
     time = 566655
     flags = 1
-    data = length 33840, hash 9A0CC574
+    data = length 62495, hash 15443B22
   sample 18:
     time = 599988
     flags = 1
-    data = length 33835, hash F85444D0
+    data = length 62803, hash 5CA16BEF
   sample 19:
     time = 633322
     flags = 1
-    data = length 33845, hash 4B29F464
+    data = length 62794, hash 6C4D3EC7
   sample 20:
     time = 666655
     flags = 1
-    data = length 33820, hash 3CDA4C6E
+    data = length 64256, hash 126F7DB3
   sample 21:
     time = 699988
     flags = 1
-    data = length 33815, hash 79E145BF
+    data = length 64779, hash B2307AE8
   sample 22:
     time = 733322
     flags = 1
-    data = length 33832, hash 584A281
+    data = length 64716, hash E630A72B
   sample 23:
     time = 766655
     flags = 1
-    data = length 33805, hash 9EA0615E
+    data = length 65023, hash 52D24B38
   sample 24:
     time = 799988
     flags = 1
-    data = length 33797, hash CC7BD45E
+    data = length 65015, hash 6226831B
   sample 25:
     time = 833322
     flags = 1
-    data = length 33476, hash E0627655
+    data = length 65810, hash 88053AB5
   sample 26:
     time = 866655
     flags = 1
-    data = length 33475, hash FBB3502A
+    data = length 65809, hash 881BEE3C
   sample 27:
     time = 899988
     flags = 1
-    data = length 33465, hash 619353FE
+    data = length 65756, hash CB2D0905
   sample 28:
     time = 933322
     flags = 1
-    data = length 33459, hash 93D6B187
+    data = length 65912, hash A811B27A
   sample 29:
     time = 966655
     flags = 1
-    data = length 33461, hash DF9982DC
+    data = length 65885, hash 4B94A886
   sample 30:
     time = 999988
     flags = 1
-    data = length 33449, hash 25E4D68E
+    data = length 66154, hash 9F2F7187
   sample 31:
     time = 1033322
     flags = 1
-    data = length 33432, hash F73FC227
+    data = length 66338, hash B1BA8F95
   sample 32:
     time = 1066655
     flags = 1
-    data = length 33419, hash B13787E3
+    data = length 67074, hash 51D243DC
   sample 33:
     time = 1099988
     flags = 1
-    data = length 33386, hash 788C2D32
+    data = length 66972, hash DBA1289
   sample 34:
     time = 1133322
     flags = 1
-    data = length 33727, hash 46D81267
+    data = length 66929, hash ADA3BDE5
   sample 35:
     time = 1166655
     flags = 1
-    data = length 33707, hash B5D58D87
+    data = length 66918, hash B8D5C472
   sample 36:
     time = 1199988
     flags = 1
-    data = length 33671, hash E7BAAE7F
+    data = length 66823, hash 88003D3D
   sample 37:
     time = 1233322
     flags = 1
-    data = length 33638, hash 18005555
+    data = length 67100, hash 7A917DF1
   sample 38:
     time = 1266655
     flags = 1
-    data = length 33593, hash 42021830
+    data = length 66888, hash 54F4444B
   sample 39:
     time = 1299988
     flags = 1
-    data = length 33569, hash D8029128
+    data = length 67473, hash 9CF0DCA8
   sample 40:
     time = 1333322
     flags = 1
-    data = length 33523, hash FB58F62
+    data = length 67891, hash C6E3A6E7
   sample 41:
     time = 1366655
     flags = 1
-    data = length 33497, hash 129B0638
+    data = length 67690, hash BDC36461
   sample 42:
     time = 1399988
     flags = 1
-    data = length 33473, hash 7A79A045
+    data = length 68105, hash BA880ECF
   sample 43:
     time = 1433322
     flags = 1
-    data = length 33445, hash 4E0CF40B
+    data = length 67986, hash A5B156AB
   sample 44:
     time = 1466655
     flags = 1
-    data = length 33418, hash 635FCB0
+    data = length 68031, hash 95AEA84D
   sample 45:
     time = 1499988
     flags = 1
-    data = length 33424, hash D2D749EE
+    data = length 68033, hash AB52B80B
   sample 46:
     time = 1533322
     flags = 1
-    data = length 33405, hash 5A62251E
+    data = length 68036, hash 433F6EBF
   sample 47:
     time = 1566655
     flags = 1
-    data = length 33403, hash 719C366
+    data = length 67986, hash 16B7182C
   sample 48:
     time = 1599988
     flags = 1
-    data = length 33422, hash 3ED7C42D
+    data = length 68121, hash 3A4729E7
   sample 49:
     time = 1633322
     flags = 1
-    data = length 33430, hash 7A8CA910
+    data = length 68193, hash 5FC954B9
   sample 50:
     time = 1666655
     flags = 1
-    data = length 33217, hash E28C94FD
+    data = length 68911, hash BF66396F
   sample 51:
     time = 1699977
     flags = 1
-    data = length 33263, hash 66DA3079
+    data = length 69017, hash E79975C4
   sample 52:
     time = 1733311
     flags = 1
-    data = length 33308, hash 7A7D0074
+    data = length 69073, hash DCD69C82
   sample 53:
     time = 1766644
     flags = 1
-    data = length 33340, hash C0B0CDEA
+    data = length 69101, hash 4BFBE937
   sample 54:
     time = 1799977
     flags = 1
-    data = length 33372, hash AB58ECF3
+    data = length 69261, hash BB3104F0
   sample 55:
     time = 1833311
     flags = 1
-    data = length 33436, hash AF2870E0
+    data = length 69290, hash 134D4EF5
   sample 56:
     time = 1866644
     flags = 1
-    data = length 33484, hash 5B399761
+    data = length 69721, hash 1CDB1A79
   sample 57:
     time = 1899977
     flags = 1
-    data = length 33533, hash 7C123CE2
+    data = length 69750, hash DC29D4B6
   sample 58:
     time = 1933311
     flags = 1
-    data = length 33577, hash 5B94935F
+    data = length 69783, hash 7EFB7D87
   sample 59:
     time = 1966644
     flags = 1
-    data = length 33615, hash 656D8603
+    data = length 70121, hash FF5B3636
   sample 60:
     time = 1999977
     flags = 1
-    data = length 33556, hash 68E72B55
+    data = length 70148, hash 8F4427
   sample 61:
     time = 2033311
     flags = 1
-    data = length 33597, hash FFB1545C
+    data = length 70209, hash A2920DE6
   sample 62:
     time = 2066644
     flags = 1
-    data = length 33605, hash 84DC1F1D
+    data = length 70248, hash 20957255
   sample 63:
     time = 2099977
     flags = 1
-    data = length 33144, hash 57E599D4
+    data = length 70265, hash 6D3B534E
   sample 64:
     time = 2133311
     flags = 1
-    data = length 33171, hash FB92ED17
+    data = length 70244, hash 280CAC31
   sample 65:
     time = 2166644
     flags = 1
-    data = length 33651, hash AF3A5151
+    data = length 70247, hash 9678FDF7
   sample 66:
     time = 2199977
     flags = 1
-    data = length 33174, hash C2094641
+    data = length 70284, hash A49FC5BB
   sample 67:
     time = 2233311
     flags = 1
-    data = length 33185, hash 17FC6A0
+    data = length 70306, hash 418532E0
   sample 68:
     time = 2266644
     flags = 1
-    data = length 33659, hash 8CAA78B3
+    data = length 70738, hash 3CBEFB41
   sample 69:
     time = 2299977
     flags = 1
-    data = length 33164, hash 611D5ED
+    data = length 70725, hash 439D70A0
   sample 70:
     time = 2333311
     flags = 1
-    data = length 33631, hash 7FC4E90C
+    data = length 70788, hash B83B828A
   sample 71:
     time = 2366644
     flags = 1
-    data = length 33157, hash 8C9BE824
+    data = length 70731, hash 42884A2B
   sample 72:
     time = 2399977
     flags = 1
-    data = length 33613, hash 8F56735C
+    data = length 70705, hash DCC1F08D
   sample 73:
     time = 2433311
     flags = 1
-    data = length 33130, hash FE728EAD
+    data = length 70676, hash 39CF1044
   sample 74:
     time = 2466644
     flags = 1
-    data = length 33589, hash 5AD12E53
+    data = length 70676, hash B4404B5E
   sample 75:
     time = 2499977
     flags = 1
-    data = length 33612, hash 40695796
+    data = length 70727, hash 1A465912
   sample 76:
     time = 2533311
     flags = 1
-    data = length 33134, hash B0122256
+    data = length 70813, hash DC08CB62
   sample 77:
     time = 2566644
     flags = 1
-    data = length 33590, hash 5787C725
+    data = length 70723, hash 92DA90EC
   sample 78:
     time = 2599977
     flags = 1
-    data = length 33595, hash 81B7A445
+    data = length 70656, hash 898E7F91
   sample 79:
     time = 2633311
     flags = 1
-    data = length 33562, hash 3B6CF24A
+    data = length 70642, hash 95CF9F57
   sample 80:
     time = 2666644
     flags = 1
-    data = length 33086, hash DFA77B90
+    data = length 70568, hash 4541E03E
   sample 81:
     time = 2699977
     flags = 1
-    data = length 33559, hash 7EE31196
+    data = length 70555, hash A6F9DCC8
   sample 82:
     time = 2733311
     flags = 1
-    data = length 33534, hash 1E533F20
+    data = length 70643, hash 3FFC9BB7
   sample 83:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 84:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 85:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 86:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 87:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 88:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 89:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 90:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 91:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 92:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 93:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 94:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 95:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 96:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 97:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 98:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 99:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 100:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 101:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 102:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 103:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 104:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 105:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 106:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 107:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 108:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 109:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 110:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 111:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 112:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 113:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 114:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 115:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 116:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 117:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 118:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 119:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 120:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 121:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 122:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 123:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump
index 2e035eee61..6c6c05809f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump
@@ -2,362 +2,362 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 2805915
+  total output bytes = 5890407
   sample count = 84
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 1366655
     flags = 1
-    data = length 33497, hash 129B0638
+    data = length 67690, hash BDC36461
   sample 1:
     time = 1399988
     flags = 1
-    data = length 33473, hash 7A79A045
+    data = length 68105, hash BA880ECF
   sample 2:
     time = 1433322
     flags = 1
-    data = length 33445, hash 4E0CF40B
+    data = length 67986, hash A5B156AB
   sample 3:
     time = 1466655
     flags = 1
-    data = length 33418, hash 635FCB0
+    data = length 68031, hash 95AEA84D
   sample 4:
     time = 1499988
     flags = 1
-    data = length 33424, hash D2D749EE
+    data = length 68033, hash AB52B80B
   sample 5:
     time = 1533322
     flags = 1
-    data = length 33405, hash 5A62251E
+    data = length 68036, hash 433F6EBF
   sample 6:
     time = 1566655
     flags = 1
-    data = length 33403, hash 719C366
+    data = length 67986, hash 16B7182C
   sample 7:
     time = 1599988
     flags = 1
-    data = length 33422, hash 3ED7C42D
+    data = length 68121, hash 3A4729E7
   sample 8:
     time = 1633322
     flags = 1
-    data = length 33430, hash 7A8CA910
+    data = length 68193, hash 5FC954B9
   sample 9:
     time = 1666655
     flags = 1
-    data = length 33217, hash E28C94FD
+    data = length 68911, hash BF66396F
   sample 10:
     time = 1699977
     flags = 1
-    data = length 33263, hash 66DA3079
+    data = length 69017, hash E79975C4
   sample 11:
     time = 1733311
     flags = 1
-    data = length 33308, hash 7A7D0074
+    data = length 69073, hash DCD69C82
   sample 12:
     time = 1766644
     flags = 1
-    data = length 33340, hash C0B0CDEA
+    data = length 69101, hash 4BFBE937
   sample 13:
     time = 1799977
     flags = 1
-    data = length 33372, hash AB58ECF3
+    data = length 69261, hash BB3104F0
   sample 14:
     time = 1833311
     flags = 1
-    data = length 33436, hash AF2870E0
+    data = length 69290, hash 134D4EF5
   sample 15:
     time = 1866644
     flags = 1
-    data = length 33484, hash 5B399761
+    data = length 69721, hash 1CDB1A79
   sample 16:
     time = 1899977
     flags = 1
-    data = length 33533, hash 7C123CE2
+    data = length 69750, hash DC29D4B6
   sample 17:
     time = 1933311
     flags = 1
-    data = length 33577, hash 5B94935F
+    data = length 69783, hash 7EFB7D87
   sample 18:
     time = 1966644
     flags = 1
-    data = length 33615, hash 656D8603
+    data = length 70121, hash FF5B3636
   sample 19:
     time = 1999977
     flags = 1
-    data = length 33556, hash 68E72B55
+    data = length 70148, hash 8F4427
   sample 20:
     time = 2033311
     flags = 1
-    data = length 33597, hash FFB1545C
+    data = length 70209, hash A2920DE6
   sample 21:
     time = 2066644
     flags = 1
-    data = length 33605, hash 84DC1F1D
+    data = length 70248, hash 20957255
   sample 22:
     time = 2099977
     flags = 1
-    data = length 33144, hash 57E599D4
+    data = length 70265, hash 6D3B534E
   sample 23:
     time = 2133311
     flags = 1
-    data = length 33171, hash FB92ED17
+    data = length 70244, hash 280CAC31
   sample 24:
     time = 2166644
     flags = 1
-    data = length 33651, hash AF3A5151
+    data = length 70247, hash 9678FDF7
   sample 25:
     time = 2199977
     flags = 1
-    data = length 33174, hash C2094641
+    data = length 70284, hash A49FC5BB
   sample 26:
     time = 2233311
     flags = 1
-    data = length 33185, hash 17FC6A0
+    data = length 70306, hash 418532E0
   sample 27:
     time = 2266644
     flags = 1
-    data = length 33659, hash 8CAA78B3
+    data = length 70738, hash 3CBEFB41
   sample 28:
     time = 2299977
     flags = 1
-    data = length 33164, hash 611D5ED
+    data = length 70725, hash 439D70A0
   sample 29:
     time = 2333311
     flags = 1
-    data = length 33631, hash 7FC4E90C
+    data = length 70788, hash B83B828A
   sample 30:
     time = 2366644
     flags = 1
-    data = length 33157, hash 8C9BE824
+    data = length 70731, hash 42884A2B
   sample 31:
     time = 2399977
     flags = 1
-    data = length 33613, hash 8F56735C
+    data = length 70705, hash DCC1F08D
   sample 32:
     time = 2433311
     flags = 1
-    data = length 33130, hash FE728EAD
+    data = length 70676, hash 39CF1044
   sample 33:
     time = 2466644
     flags = 1
-    data = length 33589, hash 5AD12E53
+    data = length 70676, hash B4404B5E
   sample 34:
     time = 2499977
     flags = 1
-    data = length 33612, hash 40695796
+    data = length 70727, hash 1A465912
   sample 35:
     time = 2533311
     flags = 1
-    data = length 33134, hash B0122256
+    data = length 70813, hash DC08CB62
   sample 36:
     time = 2566644
     flags = 1
-    data = length 33590, hash 5787C725
+    data = length 70723, hash 92DA90EC
   sample 37:
     time = 2599977
     flags = 1
-    data = length 33595, hash 81B7A445
+    data = length 70656, hash 898E7F91
   sample 38:
     time = 2633311
     flags = 1
-    data = length 33562, hash 3B6CF24A
+    data = length 70642, hash 95CF9F57
   sample 39:
     time = 2666644
     flags = 1
-    data = length 33086, hash DFA77B90
+    data = length 70568, hash 4541E03E
   sample 40:
     time = 2699977
     flags = 1
-    data = length 33559, hash 7EE31196
+    data = length 70555, hash A6F9DCC8
   sample 41:
     time = 2733311
     flags = 1
-    data = length 33534, hash 1E533F20
+    data = length 70643, hash 3FFC9BB7
   sample 42:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 43:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 44:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 45:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 46:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 47:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 48:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 49:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 50:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 51:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 52:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 53:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 54:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 55:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 56:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 57:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 58:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 59:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 60:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 61:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 62:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 63:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 64:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 65:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 66:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 67:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 68:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 69:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 70:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 71:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 72:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 73:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 74:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 75:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 76:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 77:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 78:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 79:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 80:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 81:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 82:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 83:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump
index 8db92d17f4..143eecbd50 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump
@@ -2,194 +2,194 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 1402155
+  total output bytes = 2961881
   sample count = 42
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 1:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 2:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 3:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 4:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 5:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 6:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 7:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 8:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 9:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 10:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 11:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 12:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 13:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 14:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 15:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 16:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 17:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 18:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 19:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 20:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 21:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 22:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 23:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 24:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 25:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 26:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 27:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 28:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 29:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 30:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 31:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 32:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 33:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 34:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 35:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 36:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 37:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 38:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 39:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 40:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 41:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump
index e3e1d88dc9..3c41a31c45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump
@@ -2,30 +2,30 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 33477
+  total output bytes = 70926
   sample count = 1
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump
index 93f15e3c66..9de0f5f46a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -2,526 +2,526 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 4277755
+  total output bytes = 8455938
   sample count = 125
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 0
     flags = 1
-    data = length 46291, hash F184D3EA
+    data = length 52373, hash 80FDAE9B
   sample 1:
     time = 33333
     flags = 1
-    data = length 45054, hash F206D4C7
+    data = length 53098, hash 15BB3540
   sample 2:
     time = 66666
     flags = 1
-    data = length 43917, hash 41AF8999
+    data = length 54177, hash 461C0D61
   sample 3:
     time = 100000
     flags = 1
-    data = length 42718, hash 3133C7AA
+    data = length 54942, hash 8AF2C3DA
   sample 4:
     time = 133333
     flags = 1
-    data = length 42073, hash 65FC45EF
+    data = length 55605, hash 988F3C3D
   sample 5:
     time = 166666
     flags = 1
-    data = length 41038, hash 7BD21D86
+    data = length 56867, hash A1C39A74
   sample 6:
     time = 200000
     flags = 1
-    data = length 40179, hash 9BCCCD79
+    data = length 57618, hash CC4751E6
   sample 7:
     time = 233333
     flags = 1
-    data = length 38738, hash B3D91D1B
+    data = length 58225, hash 53620F5C
   sample 8:
     time = 266666
     flags = 1
-    data = length 38176, hash FD0085E7
+    data = length 58799, hash 9C33BFA
   sample 9:
     time = 300000
     flags = 1
-    data = length 37326, hash 306F7E88
+    data = length 58973, hash 8C133C85
   sample 10:
     time = 333333
     flags = 1
-    data = length 36940, hash EE677695
+    data = length 59706, hash 9EE847FF
   sample 11:
     time = 366666
     flags = 1
-    data = length 36320, hash 3FCF3B37
+    data = length 60245, hash DCF1B3D6
   sample 12:
     time = 400000
     flags = 1
-    data = length 35664, hash A5C0C7CB
+    data = length 60813, hash 85E99B5D
   sample 13:
     time = 433333
     flags = 1
-    data = length 35666, hash F54C69A5
+    data = length 61121, hash 2F0AD0E6
   sample 14:
     time = 466666
     flags = 1
-    data = length 35300, hash 77430247
+    data = length 61587, hash 653FBFA1
   sample 15:
     time = 500000
     flags = 1
-    data = length 34693, hash BF72F842
+    data = length 61580, hash 7CD613C3
   sample 16:
     time = 533333
     flags = 1
-    data = length 34708, hash 881A49B1
+    data = length 62189, hash F965EBB5
   sample 17:
     time = 566655
     flags = 1
-    data = length 33840, hash 9A0CC574
+    data = length 62495, hash 15443B22
   sample 18:
     time = 599988
     flags = 1
-    data = length 33835, hash F85444D0
+    data = length 62803, hash 5CA16BEF
   sample 19:
     time = 633322
     flags = 1
-    data = length 33845, hash 4B29F464
+    data = length 62794, hash 6C4D3EC7
   sample 20:
     time = 666655
     flags = 1
-    data = length 33820, hash 3CDA4C6E
+    data = length 64256, hash 126F7DB3
   sample 21:
     time = 699988
     flags = 1
-    data = length 33815, hash 79E145BF
+    data = length 64779, hash B2307AE8
   sample 22:
     time = 733322
     flags = 1
-    data = length 33832, hash 584A281
+    data = length 64716, hash E630A72B
   sample 23:
     time = 766655
     flags = 1
-    data = length 33805, hash 9EA0615E
+    data = length 65023, hash 52D24B38
   sample 24:
     time = 799988
     flags = 1
-    data = length 33797, hash CC7BD45E
+    data = length 65015, hash 6226831B
   sample 25:
     time = 833322
     flags = 1
-    data = length 33476, hash E0627655
+    data = length 65810, hash 88053AB5
   sample 26:
     time = 866655
     flags = 1
-    data = length 33475, hash FBB3502A
+    data = length 65809, hash 881BEE3C
   sample 27:
     time = 899988
     flags = 1
-    data = length 33465, hash 619353FE
+    data = length 65756, hash CB2D0905
   sample 28:
     time = 933322
     flags = 1
-    data = length 33459, hash 93D6B187
+    data = length 65912, hash A811B27A
   sample 29:
     time = 966655
     flags = 1
-    data = length 33461, hash DF9982DC
+    data = length 65885, hash 4B94A886
   sample 30:
     time = 999988
     flags = 1
-    data = length 33449, hash 25E4D68E
+    data = length 66154, hash 9F2F7187
   sample 31:
     time = 1033322
     flags = 1
-    data = length 33432, hash F73FC227
+    data = length 66338, hash B1BA8F95
   sample 32:
     time = 1066655
     flags = 1
-    data = length 33419, hash B13787E3
+    data = length 67074, hash 51D243DC
   sample 33:
     time = 1099988
     flags = 1
-    data = length 33386, hash 788C2D32
+    data = length 66972, hash DBA1289
   sample 34:
     time = 1133322
     flags = 1
-    data = length 33727, hash 46D81267
+    data = length 66929, hash ADA3BDE5
   sample 35:
     time = 1166655
     flags = 1
-    data = length 33707, hash B5D58D87
+    data = length 66918, hash B8D5C472
   sample 36:
     time = 1199988
     flags = 1
-    data = length 33671, hash E7BAAE7F
+    data = length 66823, hash 88003D3D
   sample 37:
     time = 1233322
     flags = 1
-    data = length 33638, hash 18005555
+    data = length 67100, hash 7A917DF1
   sample 38:
     time = 1266655
     flags = 1
-    data = length 33593, hash 42021830
+    data = length 66888, hash 54F4444B
   sample 39:
     time = 1299988
     flags = 1
-    data = length 33569, hash D8029128
+    data = length 67473, hash 9CF0DCA8
   sample 40:
     time = 1333322
     flags = 1
-    data = length 33523, hash FB58F62
+    data = length 67891, hash C6E3A6E7
   sample 41:
     time = 1366655
     flags = 1
-    data = length 33497, hash 129B0638
+    data = length 67690, hash BDC36461
   sample 42:
     time = 1399988
     flags = 1
-    data = length 33473, hash 7A79A045
+    data = length 68105, hash BA880ECF
   sample 43:
     time = 1433322
     flags = 1
-    data = length 33445, hash 4E0CF40B
+    data = length 67986, hash A5B156AB
   sample 44:
     time = 1466655
     flags = 1
-    data = length 33418, hash 635FCB0
+    data = length 68031, hash 95AEA84D
   sample 45:
     time = 1499988
     flags = 1
-    data = length 33424, hash D2D749EE
+    data = length 68033, hash AB52B80B
   sample 46:
     time = 1533322
     flags = 1
-    data = length 33405, hash 5A62251E
+    data = length 68036, hash 433F6EBF
   sample 47:
     time = 1566655
     flags = 1
-    data = length 33403, hash 719C366
+    data = length 67986, hash 16B7182C
   sample 48:
     time = 1599988
     flags = 1
-    data = length 33422, hash 3ED7C42D
+    data = length 68121, hash 3A4729E7
   sample 49:
     time = 1633322
     flags = 1
-    data = length 33430, hash 7A8CA910
+    data = length 68193, hash 5FC954B9
   sample 50:
     time = 1666655
     flags = 1
-    data = length 33217, hash E28C94FD
+    data = length 68911, hash BF66396F
   sample 51:
     time = 1699977
     flags = 1
-    data = length 33263, hash 66DA3079
+    data = length 69017, hash E79975C4
   sample 52:
     time = 1733311
     flags = 1
-    data = length 33308, hash 7A7D0074
+    data = length 69073, hash DCD69C82
   sample 53:
     time = 1766644
     flags = 1
-    data = length 33340, hash C0B0CDEA
+    data = length 69101, hash 4BFBE937
   sample 54:
     time = 1799977
     flags = 1
-    data = length 33372, hash AB58ECF3
+    data = length 69261, hash BB3104F0
   sample 55:
     time = 1833311
     flags = 1
-    data = length 33436, hash AF2870E0
+    data = length 69290, hash 134D4EF5
   sample 56:
     time = 1866644
     flags = 1
-    data = length 33484, hash 5B399761
+    data = length 69721, hash 1CDB1A79
   sample 57:
     time = 1899977
     flags = 1
-    data = length 33533, hash 7C123CE2
+    data = length 69750, hash DC29D4B6
   sample 58:
     time = 1933311
     flags = 1
-    data = length 33577, hash 5B94935F
+    data = length 69783, hash 7EFB7D87
   sample 59:
     time = 1966644
     flags = 1
-    data = length 33615, hash 656D8603
+    data = length 70121, hash FF5B3636
   sample 60:
     time = 1999977
     flags = 1
-    data = length 33556, hash 68E72B55
+    data = length 70148, hash 8F4427
   sample 61:
     time = 2033311
     flags = 1
-    data = length 33597, hash FFB1545C
+    data = length 70209, hash A2920DE6
   sample 62:
     time = 2066644
     flags = 1
-    data = length 33605, hash 84DC1F1D
+    data = length 70248, hash 20957255
   sample 63:
     time = 2099977
     flags = 1
-    data = length 33144, hash 57E599D4
+    data = length 70265, hash 6D3B534E
   sample 64:
     time = 2133311
     flags = 1
-    data = length 33171, hash FB92ED17
+    data = length 70244, hash 280CAC31
   sample 65:
     time = 2166644
     flags = 1
-    data = length 33651, hash AF3A5151
+    data = length 70247, hash 9678FDF7
   sample 66:
     time = 2199977
     flags = 1
-    data = length 33174, hash C2094641
+    data = length 70284, hash A49FC5BB
   sample 67:
     time = 2233311
     flags = 1
-    data = length 33185, hash 17FC6A0
+    data = length 70306, hash 418532E0
   sample 68:
     time = 2266644
     flags = 1
-    data = length 33659, hash 8CAA78B3
+    data = length 70738, hash 3CBEFB41
   sample 69:
     time = 2299977
     flags = 1
-    data = length 33164, hash 611D5ED
+    data = length 70725, hash 439D70A0
   sample 70:
     time = 2333311
     flags = 1
-    data = length 33631, hash 7FC4E90C
+    data = length 70788, hash B83B828A
   sample 71:
     time = 2366644
     flags = 1
-    data = length 33157, hash 8C9BE824
+    data = length 70731, hash 42884A2B
   sample 72:
     time = 2399977
     flags = 1
-    data = length 33613, hash 8F56735C
+    data = length 70705, hash DCC1F08D
   sample 73:
     time = 2433311
     flags = 1
-    data = length 33130, hash FE728EAD
+    data = length 70676, hash 39CF1044
   sample 74:
     time = 2466644
     flags = 1
-    data = length 33589, hash 5AD12E53
+    data = length 70676, hash B4404B5E
   sample 75:
     time = 2499977
     flags = 1
-    data = length 33612, hash 40695796
+    data = length 70727, hash 1A465912
   sample 76:
     time = 2533311
     flags = 1
-    data = length 33134, hash B0122256
+    data = length 70813, hash DC08CB62
   sample 77:
     time = 2566644
     flags = 1
-    data = length 33590, hash 5787C725
+    data = length 70723, hash 92DA90EC
   sample 78:
     time = 2599977
     flags = 1
-    data = length 33595, hash 81B7A445
+    data = length 70656, hash 898E7F91
   sample 79:
     time = 2633311
     flags = 1
-    data = length 33562, hash 3B6CF24A
+    data = length 70642, hash 95CF9F57
   sample 80:
     time = 2666644
     flags = 1
-    data = length 33086, hash DFA77B90
+    data = length 70568, hash 4541E03E
   sample 81:
     time = 2699977
     flags = 1
-    data = length 33559, hash 7EE31196
+    data = length 70555, hash A6F9DCC8
   sample 82:
     time = 2733311
     flags = 1
-    data = length 33534, hash 1E533F20
+    data = length 70643, hash 3FFC9BB7
   sample 83:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 84:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 85:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 86:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 87:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 88:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 89:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 90:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 91:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 92:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 93:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 94:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 95:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 96:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 97:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 98:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 99:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 100:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 101:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 102:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 103:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 104:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 105:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 106:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 107:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 108:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 109:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 110:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 111:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 112:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 113:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 114:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 115:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 116:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 117:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 118:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 119:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 120:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 121:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 122:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 123:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump
index 2e035eee61..6c6c05809f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -2,362 +2,362 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 2805915
+  total output bytes = 5890407
   sample count = 84
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 1366655
     flags = 1
-    data = length 33497, hash 129B0638
+    data = length 67690, hash BDC36461
   sample 1:
     time = 1399988
     flags = 1
-    data = length 33473, hash 7A79A045
+    data = length 68105, hash BA880ECF
   sample 2:
     time = 1433322
     flags = 1
-    data = length 33445, hash 4E0CF40B
+    data = length 67986, hash A5B156AB
   sample 3:
     time = 1466655
     flags = 1
-    data = length 33418, hash 635FCB0
+    data = length 68031, hash 95AEA84D
   sample 4:
     time = 1499988
     flags = 1
-    data = length 33424, hash D2D749EE
+    data = length 68033, hash AB52B80B
   sample 5:
     time = 1533322
     flags = 1
-    data = length 33405, hash 5A62251E
+    data = length 68036, hash 433F6EBF
   sample 6:
     time = 1566655
     flags = 1
-    data = length 33403, hash 719C366
+    data = length 67986, hash 16B7182C
   sample 7:
     time = 1599988
     flags = 1
-    data = length 33422, hash 3ED7C42D
+    data = length 68121, hash 3A4729E7
   sample 8:
     time = 1633322
     flags = 1
-    data = length 33430, hash 7A8CA910
+    data = length 68193, hash 5FC954B9
   sample 9:
     time = 1666655
     flags = 1
-    data = length 33217, hash E28C94FD
+    data = length 68911, hash BF66396F
   sample 10:
     time = 1699977
     flags = 1
-    data = length 33263, hash 66DA3079
+    data = length 69017, hash E79975C4
   sample 11:
     time = 1733311
     flags = 1
-    data = length 33308, hash 7A7D0074
+    data = length 69073, hash DCD69C82
   sample 12:
     time = 1766644
     flags = 1
-    data = length 33340, hash C0B0CDEA
+    data = length 69101, hash 4BFBE937
   sample 13:
     time = 1799977
     flags = 1
-    data = length 33372, hash AB58ECF3
+    data = length 69261, hash BB3104F0
   sample 14:
     time = 1833311
     flags = 1
-    data = length 33436, hash AF2870E0
+    data = length 69290, hash 134D4EF5
   sample 15:
     time = 1866644
     flags = 1
-    data = length 33484, hash 5B399761
+    data = length 69721, hash 1CDB1A79
   sample 16:
     time = 1899977
     flags = 1
-    data = length 33533, hash 7C123CE2
+    data = length 69750, hash DC29D4B6
   sample 17:
     time = 1933311
     flags = 1
-    data = length 33577, hash 5B94935F
+    data = length 69783, hash 7EFB7D87
   sample 18:
     time = 1966644
     flags = 1
-    data = length 33615, hash 656D8603
+    data = length 70121, hash FF5B3636
   sample 19:
     time = 1999977
     flags = 1
-    data = length 33556, hash 68E72B55
+    data = length 70148, hash 8F4427
   sample 20:
     time = 2033311
     flags = 1
-    data = length 33597, hash FFB1545C
+    data = length 70209, hash A2920DE6
   sample 21:
     time = 2066644
     flags = 1
-    data = length 33605, hash 84DC1F1D
+    data = length 70248, hash 20957255
   sample 22:
     time = 2099977
     flags = 1
-    data = length 33144, hash 57E599D4
+    data = length 70265, hash 6D3B534E
   sample 23:
     time = 2133311
     flags = 1
-    data = length 33171, hash FB92ED17
+    data = length 70244, hash 280CAC31
   sample 24:
     time = 2166644
     flags = 1
-    data = length 33651, hash AF3A5151
+    data = length 70247, hash 9678FDF7
   sample 25:
     time = 2199977
     flags = 1
-    data = length 33174, hash C2094641
+    data = length 70284, hash A49FC5BB
   sample 26:
     time = 2233311
     flags = 1
-    data = length 33185, hash 17FC6A0
+    data = length 70306, hash 418532E0
   sample 27:
     time = 2266644
     flags = 1
-    data = length 33659, hash 8CAA78B3
+    data = length 70738, hash 3CBEFB41
   sample 28:
     time = 2299977
     flags = 1
-    data = length 33164, hash 611D5ED
+    data = length 70725, hash 439D70A0
   sample 29:
     time = 2333311
     flags = 1
-    data = length 33631, hash 7FC4E90C
+    data = length 70788, hash B83B828A
   sample 30:
     time = 2366644
     flags = 1
-    data = length 33157, hash 8C9BE824
+    data = length 70731, hash 42884A2B
   sample 31:
     time = 2399977
     flags = 1
-    data = length 33613, hash 8F56735C
+    data = length 70705, hash DCC1F08D
   sample 32:
     time = 2433311
     flags = 1
-    data = length 33130, hash FE728EAD
+    data = length 70676, hash 39CF1044
   sample 33:
     time = 2466644
     flags = 1
-    data = length 33589, hash 5AD12E53
+    data = length 70676, hash B4404B5E
   sample 34:
     time = 2499977
     flags = 1
-    data = length 33612, hash 40695796
+    data = length 70727, hash 1A465912
   sample 35:
     time = 2533311
     flags = 1
-    data = length 33134, hash B0122256
+    data = length 70813, hash DC08CB62
   sample 36:
     time = 2566644
     flags = 1
-    data = length 33590, hash 5787C725
+    data = length 70723, hash 92DA90EC
   sample 37:
     time = 2599977
     flags = 1
-    data = length 33595, hash 81B7A445
+    data = length 70656, hash 898E7F91
   sample 38:
     time = 2633311
     flags = 1
-    data = length 33562, hash 3B6CF24A
+    data = length 70642, hash 95CF9F57
   sample 39:
     time = 2666644
     flags = 1
-    data = length 33086, hash DFA77B90
+    data = length 70568, hash 4541E03E
   sample 40:
     time = 2699977
     flags = 1
-    data = length 33559, hash 7EE31196
+    data = length 70555, hash A6F9DCC8
   sample 41:
     time = 2733311
     flags = 1
-    data = length 33534, hash 1E533F20
+    data = length 70643, hash 3FFC9BB7
   sample 42:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 43:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 44:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 45:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 46:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 47:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 48:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 49:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 50:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 51:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 52:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 53:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 54:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 55:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 56:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 57:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 58:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 59:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 60:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 61:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 62:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 63:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 64:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 65:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 66:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 67:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 68:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 69:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 70:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 71:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 72:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 73:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 74:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 75:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 76:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 77:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 78:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 79:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 80:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 81:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 82:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 83:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump
index 8db92d17f4..143eecbd50 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -2,194 +2,194 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 1402155
+  total output bytes = 2961881
   sample count = 42
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 1:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 2:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 3:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 4:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 5:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 6:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 7:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 8:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 9:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 10:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 11:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 12:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 13:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 14:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 15:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 16:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 17:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 18:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 19:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 20:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 21:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 22:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 23:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 24:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 25:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 26:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 27:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 28:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 29:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 30:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 31:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 32:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 33:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 34:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 35:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 36:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 37:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 38:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 39:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 40:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 41:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump
index e3e1d88dc9..3c41a31c45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -2,30 +2,30 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 33477
+  total output bytes = 70926
   sample count = 1
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 93f15e3c66..9de0f5f46a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -2,526 +2,526 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 4277755
+  total output bytes = 8455938
   sample count = 125
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 0
     flags = 1
-    data = length 46291, hash F184D3EA
+    data = length 52373, hash 80FDAE9B
   sample 1:
     time = 33333
     flags = 1
-    data = length 45054, hash F206D4C7
+    data = length 53098, hash 15BB3540
   sample 2:
     time = 66666
     flags = 1
-    data = length 43917, hash 41AF8999
+    data = length 54177, hash 461C0D61
   sample 3:
     time = 100000
     flags = 1
-    data = length 42718, hash 3133C7AA
+    data = length 54942, hash 8AF2C3DA
   sample 4:
     time = 133333
     flags = 1
-    data = length 42073, hash 65FC45EF
+    data = length 55605, hash 988F3C3D
   sample 5:
     time = 166666
     flags = 1
-    data = length 41038, hash 7BD21D86
+    data = length 56867, hash A1C39A74
   sample 6:
     time = 200000
     flags = 1
-    data = length 40179, hash 9BCCCD79
+    data = length 57618, hash CC4751E6
   sample 7:
     time = 233333
     flags = 1
-    data = length 38738, hash B3D91D1B
+    data = length 58225, hash 53620F5C
   sample 8:
     time = 266666
     flags = 1
-    data = length 38176, hash FD0085E7
+    data = length 58799, hash 9C33BFA
   sample 9:
     time = 300000
     flags = 1
-    data = length 37326, hash 306F7E88
+    data = length 58973, hash 8C133C85
   sample 10:
     time = 333333
     flags = 1
-    data = length 36940, hash EE677695
+    data = length 59706, hash 9EE847FF
   sample 11:
     time = 366666
     flags = 1
-    data = length 36320, hash 3FCF3B37
+    data = length 60245, hash DCF1B3D6
   sample 12:
     time = 400000
     flags = 1
-    data = length 35664, hash A5C0C7CB
+    data = length 60813, hash 85E99B5D
   sample 13:
     time = 433333
     flags = 1
-    data = length 35666, hash F54C69A5
+    data = length 61121, hash 2F0AD0E6
   sample 14:
     time = 466666
     flags = 1
-    data = length 35300, hash 77430247
+    data = length 61587, hash 653FBFA1
   sample 15:
     time = 500000
     flags = 1
-    data = length 34693, hash BF72F842
+    data = length 61580, hash 7CD613C3
   sample 16:
     time = 533333
     flags = 1
-    data = length 34708, hash 881A49B1
+    data = length 62189, hash F965EBB5
   sample 17:
     time = 566655
     flags = 1
-    data = length 33840, hash 9A0CC574
+    data = length 62495, hash 15443B22
   sample 18:
     time = 599988
     flags = 1
-    data = length 33835, hash F85444D0
+    data = length 62803, hash 5CA16BEF
   sample 19:
     time = 633322
     flags = 1
-    data = length 33845, hash 4B29F464
+    data = length 62794, hash 6C4D3EC7
   sample 20:
     time = 666655
     flags = 1
-    data = length 33820, hash 3CDA4C6E
+    data = length 64256, hash 126F7DB3
   sample 21:
     time = 699988
     flags = 1
-    data = length 33815, hash 79E145BF
+    data = length 64779, hash B2307AE8
   sample 22:
     time = 733322
     flags = 1
-    data = length 33832, hash 584A281
+    data = length 64716, hash E630A72B
   sample 23:
     time = 766655
     flags = 1
-    data = length 33805, hash 9EA0615E
+    data = length 65023, hash 52D24B38
   sample 24:
     time = 799988
     flags = 1
-    data = length 33797, hash CC7BD45E
+    data = length 65015, hash 6226831B
   sample 25:
     time = 833322
     flags = 1
-    data = length 33476, hash E0627655
+    data = length 65810, hash 88053AB5
   sample 26:
     time = 866655
     flags = 1
-    data = length 33475, hash FBB3502A
+    data = length 65809, hash 881BEE3C
   sample 27:
     time = 899988
     flags = 1
-    data = length 33465, hash 619353FE
+    data = length 65756, hash CB2D0905
   sample 28:
     time = 933322
     flags = 1
-    data = length 33459, hash 93D6B187
+    data = length 65912, hash A811B27A
   sample 29:
     time = 966655
     flags = 1
-    data = length 33461, hash DF9982DC
+    data = length 65885, hash 4B94A886
   sample 30:
     time = 999988
     flags = 1
-    data = length 33449, hash 25E4D68E
+    data = length 66154, hash 9F2F7187
   sample 31:
     time = 1033322
     flags = 1
-    data = length 33432, hash F73FC227
+    data = length 66338, hash B1BA8F95
   sample 32:
     time = 1066655
     flags = 1
-    data = length 33419, hash B13787E3
+    data = length 67074, hash 51D243DC
   sample 33:
     time = 1099988
     flags = 1
-    data = length 33386, hash 788C2D32
+    data = length 66972, hash DBA1289
   sample 34:
     time = 1133322
     flags = 1
-    data = length 33727, hash 46D81267
+    data = length 66929, hash ADA3BDE5
   sample 35:
     time = 1166655
     flags = 1
-    data = length 33707, hash B5D58D87
+    data = length 66918, hash B8D5C472
   sample 36:
     time = 1199988
     flags = 1
-    data = length 33671, hash E7BAAE7F
+    data = length 66823, hash 88003D3D
   sample 37:
     time = 1233322
     flags = 1
-    data = length 33638, hash 18005555
+    data = length 67100, hash 7A917DF1
   sample 38:
     time = 1266655
     flags = 1
-    data = length 33593, hash 42021830
+    data = length 66888, hash 54F4444B
   sample 39:
     time = 1299988
     flags = 1
-    data = length 33569, hash D8029128
+    data = length 67473, hash 9CF0DCA8
   sample 40:
     time = 1333322
     flags = 1
-    data = length 33523, hash FB58F62
+    data = length 67891, hash C6E3A6E7
   sample 41:
     time = 1366655
     flags = 1
-    data = length 33497, hash 129B0638
+    data = length 67690, hash BDC36461
   sample 42:
     time = 1399988
     flags = 1
-    data = length 33473, hash 7A79A045
+    data = length 68105, hash BA880ECF
   sample 43:
     time = 1433322
     flags = 1
-    data = length 33445, hash 4E0CF40B
+    data = length 67986, hash A5B156AB
   sample 44:
     time = 1466655
     flags = 1
-    data = length 33418, hash 635FCB0
+    data = length 68031, hash 95AEA84D
   sample 45:
     time = 1499988
     flags = 1
-    data = length 33424, hash D2D749EE
+    data = length 68033, hash AB52B80B
   sample 46:
     time = 1533322
     flags = 1
-    data = length 33405, hash 5A62251E
+    data = length 68036, hash 433F6EBF
   sample 47:
     time = 1566655
     flags = 1
-    data = length 33403, hash 719C366
+    data = length 67986, hash 16B7182C
   sample 48:
     time = 1599988
     flags = 1
-    data = length 33422, hash 3ED7C42D
+    data = length 68121, hash 3A4729E7
   sample 49:
     time = 1633322
     flags = 1
-    data = length 33430, hash 7A8CA910
+    data = length 68193, hash 5FC954B9
   sample 50:
     time = 1666655
     flags = 1
-    data = length 33217, hash E28C94FD
+    data = length 68911, hash BF66396F
   sample 51:
     time = 1699977
     flags = 1
-    data = length 33263, hash 66DA3079
+    data = length 69017, hash E79975C4
   sample 52:
     time = 1733311
     flags = 1
-    data = length 33308, hash 7A7D0074
+    data = length 69073, hash DCD69C82
   sample 53:
     time = 1766644
     flags = 1
-    data = length 33340, hash C0B0CDEA
+    data = length 69101, hash 4BFBE937
   sample 54:
     time = 1799977
     flags = 1
-    data = length 33372, hash AB58ECF3
+    data = length 69261, hash BB3104F0
   sample 55:
     time = 1833311
     flags = 1
-    data = length 33436, hash AF2870E0
+    data = length 69290, hash 134D4EF5
   sample 56:
     time = 1866644
     flags = 1
-    data = length 33484, hash 5B399761
+    data = length 69721, hash 1CDB1A79
   sample 57:
     time = 1899977
     flags = 1
-    data = length 33533, hash 7C123CE2
+    data = length 69750, hash DC29D4B6
   sample 58:
     time = 1933311
     flags = 1
-    data = length 33577, hash 5B94935F
+    data = length 69783, hash 7EFB7D87
   sample 59:
     time = 1966644
     flags = 1
-    data = length 33615, hash 656D8603
+    data = length 70121, hash FF5B3636
   sample 60:
     time = 1999977
     flags = 1
-    data = length 33556, hash 68E72B55
+    data = length 70148, hash 8F4427
   sample 61:
     time = 2033311
     flags = 1
-    data = length 33597, hash FFB1545C
+    data = length 70209, hash A2920DE6
   sample 62:
     time = 2066644
     flags = 1
-    data = length 33605, hash 84DC1F1D
+    data = length 70248, hash 20957255
   sample 63:
     time = 2099977
     flags = 1
-    data = length 33144, hash 57E599D4
+    data = length 70265, hash 6D3B534E
   sample 64:
     time = 2133311
     flags = 1
-    data = length 33171, hash FB92ED17
+    data = length 70244, hash 280CAC31
   sample 65:
     time = 2166644
     flags = 1
-    data = length 33651, hash AF3A5151
+    data = length 70247, hash 9678FDF7
   sample 66:
     time = 2199977
     flags = 1
-    data = length 33174, hash C2094641
+    data = length 70284, hash A49FC5BB
   sample 67:
     time = 2233311
     flags = 1
-    data = length 33185, hash 17FC6A0
+    data = length 70306, hash 418532E0
   sample 68:
     time = 2266644
     flags = 1
-    data = length 33659, hash 8CAA78B3
+    data = length 70738, hash 3CBEFB41
   sample 69:
     time = 2299977
     flags = 1
-    data = length 33164, hash 611D5ED
+    data = length 70725, hash 439D70A0
   sample 70:
     time = 2333311
     flags = 1
-    data = length 33631, hash 7FC4E90C
+    data = length 70788, hash B83B828A
   sample 71:
     time = 2366644
     flags = 1
-    data = length 33157, hash 8C9BE824
+    data = length 70731, hash 42884A2B
   sample 72:
     time = 2399977
     flags = 1
-    data = length 33613, hash 8F56735C
+    data = length 70705, hash DCC1F08D
   sample 73:
     time = 2433311
     flags = 1
-    data = length 33130, hash FE728EAD
+    data = length 70676, hash 39CF1044
   sample 74:
     time = 2466644
     flags = 1
-    data = length 33589, hash 5AD12E53
+    data = length 70676, hash B4404B5E
   sample 75:
     time = 2499977
     flags = 1
-    data = length 33612, hash 40695796
+    data = length 70727, hash 1A465912
   sample 76:
     time = 2533311
     flags = 1
-    data = length 33134, hash B0122256
+    data = length 70813, hash DC08CB62
   sample 77:
     time = 2566644
     flags = 1
-    data = length 33590, hash 5787C725
+    data = length 70723, hash 92DA90EC
   sample 78:
     time = 2599977
     flags = 1
-    data = length 33595, hash 81B7A445
+    data = length 70656, hash 898E7F91
   sample 79:
     time = 2633311
     flags = 1
-    data = length 33562, hash 3B6CF24A
+    data = length 70642, hash 95CF9F57
   sample 80:
     time = 2666644
     flags = 1
-    data = length 33086, hash DFA77B90
+    data = length 70568, hash 4541E03E
   sample 81:
     time = 2699977
     flags = 1
-    data = length 33559, hash 7EE31196
+    data = length 70555, hash A6F9DCC8
   sample 82:
     time = 2733311
     flags = 1
-    data = length 33534, hash 1E533F20
+    data = length 70643, hash 3FFC9BB7
   sample 83:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 84:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 85:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 86:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 87:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 88:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 89:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 90:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 91:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 92:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 93:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 94:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 95:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 96:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 97:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 98:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 99:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 100:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 101:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 102:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 103:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 104:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 105:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 106:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 107:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 108:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 109:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 110:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 111:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 112:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 113:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 114:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 115:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 116:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 117:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 118:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 119:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 120:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 121:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 122:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 123:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump
index 93f15e3c66..9de0f5f46a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump
@@ -2,526 +2,526 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=46331]]
-  getPosition(2083300) = [[timeUs=2066644, position=2174095], [timeUs=2099977, position=2207700]]
-  getPosition(4166600) = [[timeUs=4133288, position=4244318]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52413]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012137], [timeUs=2099977, position=4082385]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385052]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 4277755
+  total output bytes = 8455938
   sample count = 125
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 8
       chromaBitdepth = 8
-    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3805782157, modification time=3805782157, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=14, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3816721470, modification time=3816721470, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 0
     flags = 1
-    data = length 46291, hash F184D3EA
+    data = length 52373, hash 80FDAE9B
   sample 1:
     time = 33333
     flags = 1
-    data = length 45054, hash F206D4C7
+    data = length 53098, hash 15BB3540
   sample 2:
     time = 66666
     flags = 1
-    data = length 43917, hash 41AF8999
+    data = length 54177, hash 461C0D61
   sample 3:
     time = 100000
     flags = 1
-    data = length 42718, hash 3133C7AA
+    data = length 54942, hash 8AF2C3DA
   sample 4:
     time = 133333
     flags = 1
-    data = length 42073, hash 65FC45EF
+    data = length 55605, hash 988F3C3D
   sample 5:
     time = 166666
     flags = 1
-    data = length 41038, hash 7BD21D86
+    data = length 56867, hash A1C39A74
   sample 6:
     time = 200000
     flags = 1
-    data = length 40179, hash 9BCCCD79
+    data = length 57618, hash CC4751E6
   sample 7:
     time = 233333
     flags = 1
-    data = length 38738, hash B3D91D1B
+    data = length 58225, hash 53620F5C
   sample 8:
     time = 266666
     flags = 1
-    data = length 38176, hash FD0085E7
+    data = length 58799, hash 9C33BFA
   sample 9:
     time = 300000
     flags = 1
-    data = length 37326, hash 306F7E88
+    data = length 58973, hash 8C133C85
   sample 10:
     time = 333333
     flags = 1
-    data = length 36940, hash EE677695
+    data = length 59706, hash 9EE847FF
   sample 11:
     time = 366666
     flags = 1
-    data = length 36320, hash 3FCF3B37
+    data = length 60245, hash DCF1B3D6
   sample 12:
     time = 400000
     flags = 1
-    data = length 35664, hash A5C0C7CB
+    data = length 60813, hash 85E99B5D
   sample 13:
     time = 433333
     flags = 1
-    data = length 35666, hash F54C69A5
+    data = length 61121, hash 2F0AD0E6
   sample 14:
     time = 466666
     flags = 1
-    data = length 35300, hash 77430247
+    data = length 61587, hash 653FBFA1
   sample 15:
     time = 500000
     flags = 1
-    data = length 34693, hash BF72F842
+    data = length 61580, hash 7CD613C3
   sample 16:
     time = 533333
     flags = 1
-    data = length 34708, hash 881A49B1
+    data = length 62189, hash F965EBB5
   sample 17:
     time = 566655
     flags = 1
-    data = length 33840, hash 9A0CC574
+    data = length 62495, hash 15443B22
   sample 18:
     time = 599988
     flags = 1
-    data = length 33835, hash F85444D0
+    data = length 62803, hash 5CA16BEF
   sample 19:
     time = 633322
     flags = 1
-    data = length 33845, hash 4B29F464
+    data = length 62794, hash 6C4D3EC7
   sample 20:
     time = 666655
     flags = 1
-    data = length 33820, hash 3CDA4C6E
+    data = length 64256, hash 126F7DB3
   sample 21:
     time = 699988
     flags = 1
-    data = length 33815, hash 79E145BF
+    data = length 64779, hash B2307AE8
   sample 22:
     time = 733322
     flags = 1
-    data = length 33832, hash 584A281
+    data = length 64716, hash E630A72B
   sample 23:
     time = 766655
     flags = 1
-    data = length 33805, hash 9EA0615E
+    data = length 65023, hash 52D24B38
   sample 24:
     time = 799988
     flags = 1
-    data = length 33797, hash CC7BD45E
+    data = length 65015, hash 6226831B
   sample 25:
     time = 833322
     flags = 1
-    data = length 33476, hash E0627655
+    data = length 65810, hash 88053AB5
   sample 26:
     time = 866655
     flags = 1
-    data = length 33475, hash FBB3502A
+    data = length 65809, hash 881BEE3C
   sample 27:
     time = 899988
     flags = 1
-    data = length 33465, hash 619353FE
+    data = length 65756, hash CB2D0905
   sample 28:
     time = 933322
     flags = 1
-    data = length 33459, hash 93D6B187
+    data = length 65912, hash A811B27A
   sample 29:
     time = 966655
     flags = 1
-    data = length 33461, hash DF9982DC
+    data = length 65885, hash 4B94A886
   sample 30:
     time = 999988
     flags = 1
-    data = length 33449, hash 25E4D68E
+    data = length 66154, hash 9F2F7187
   sample 31:
     time = 1033322
     flags = 1
-    data = length 33432, hash F73FC227
+    data = length 66338, hash B1BA8F95
   sample 32:
     time = 1066655
     flags = 1
-    data = length 33419, hash B13787E3
+    data = length 67074, hash 51D243DC
   sample 33:
     time = 1099988
     flags = 1
-    data = length 33386, hash 788C2D32
+    data = length 66972, hash DBA1289
   sample 34:
     time = 1133322
     flags = 1
-    data = length 33727, hash 46D81267
+    data = length 66929, hash ADA3BDE5
   sample 35:
     time = 1166655
     flags = 1
-    data = length 33707, hash B5D58D87
+    data = length 66918, hash B8D5C472
   sample 36:
     time = 1199988
     flags = 1
-    data = length 33671, hash E7BAAE7F
+    data = length 66823, hash 88003D3D
   sample 37:
     time = 1233322
     flags = 1
-    data = length 33638, hash 18005555
+    data = length 67100, hash 7A917DF1
   sample 38:
     time = 1266655
     flags = 1
-    data = length 33593, hash 42021830
+    data = length 66888, hash 54F4444B
   sample 39:
     time = 1299988
     flags = 1
-    data = length 33569, hash D8029128
+    data = length 67473, hash 9CF0DCA8
   sample 40:
     time = 1333322
     flags = 1
-    data = length 33523, hash FB58F62
+    data = length 67891, hash C6E3A6E7
   sample 41:
     time = 1366655
     flags = 1
-    data = length 33497, hash 129B0638
+    data = length 67690, hash BDC36461
   sample 42:
     time = 1399988
     flags = 1
-    data = length 33473, hash 7A79A045
+    data = length 68105, hash BA880ECF
   sample 43:
     time = 1433322
     flags = 1
-    data = length 33445, hash 4E0CF40B
+    data = length 67986, hash A5B156AB
   sample 44:
     time = 1466655
     flags = 1
-    data = length 33418, hash 635FCB0
+    data = length 68031, hash 95AEA84D
   sample 45:
     time = 1499988
     flags = 1
-    data = length 33424, hash D2D749EE
+    data = length 68033, hash AB52B80B
   sample 46:
     time = 1533322
     flags = 1
-    data = length 33405, hash 5A62251E
+    data = length 68036, hash 433F6EBF
   sample 47:
     time = 1566655
     flags = 1
-    data = length 33403, hash 719C366
+    data = length 67986, hash 16B7182C
   sample 48:
     time = 1599988
     flags = 1
-    data = length 33422, hash 3ED7C42D
+    data = length 68121, hash 3A4729E7
   sample 49:
     time = 1633322
     flags = 1
-    data = length 33430, hash 7A8CA910
+    data = length 68193, hash 5FC954B9
   sample 50:
     time = 1666655
     flags = 1
-    data = length 33217, hash E28C94FD
+    data = length 68911, hash BF66396F
   sample 51:
     time = 1699977
     flags = 1
-    data = length 33263, hash 66DA3079
+    data = length 69017, hash E79975C4
   sample 52:
     time = 1733311
     flags = 1
-    data = length 33308, hash 7A7D0074
+    data = length 69073, hash DCD69C82
   sample 53:
     time = 1766644
     flags = 1
-    data = length 33340, hash C0B0CDEA
+    data = length 69101, hash 4BFBE937
   sample 54:
     time = 1799977
     flags = 1
-    data = length 33372, hash AB58ECF3
+    data = length 69261, hash BB3104F0
   sample 55:
     time = 1833311
     flags = 1
-    data = length 33436, hash AF2870E0
+    data = length 69290, hash 134D4EF5
   sample 56:
     time = 1866644
     flags = 1
-    data = length 33484, hash 5B399761
+    data = length 69721, hash 1CDB1A79
   sample 57:
     time = 1899977
     flags = 1
-    data = length 33533, hash 7C123CE2
+    data = length 69750, hash DC29D4B6
   sample 58:
     time = 1933311
     flags = 1
-    data = length 33577, hash 5B94935F
+    data = length 69783, hash 7EFB7D87
   sample 59:
     time = 1966644
     flags = 1
-    data = length 33615, hash 656D8603
+    data = length 70121, hash FF5B3636
   sample 60:
     time = 1999977
     flags = 1
-    data = length 33556, hash 68E72B55
+    data = length 70148, hash 8F4427
   sample 61:
     time = 2033311
     flags = 1
-    data = length 33597, hash FFB1545C
+    data = length 70209, hash A2920DE6
   sample 62:
     time = 2066644
     flags = 1
-    data = length 33605, hash 84DC1F1D
+    data = length 70248, hash 20957255
   sample 63:
     time = 2099977
     flags = 1
-    data = length 33144, hash 57E599D4
+    data = length 70265, hash 6D3B534E
   sample 64:
     time = 2133311
     flags = 1
-    data = length 33171, hash FB92ED17
+    data = length 70244, hash 280CAC31
   sample 65:
     time = 2166644
     flags = 1
-    data = length 33651, hash AF3A5151
+    data = length 70247, hash 9678FDF7
   sample 66:
     time = 2199977
     flags = 1
-    data = length 33174, hash C2094641
+    data = length 70284, hash A49FC5BB
   sample 67:
     time = 2233311
     flags = 1
-    data = length 33185, hash 17FC6A0
+    data = length 70306, hash 418532E0
   sample 68:
     time = 2266644
     flags = 1
-    data = length 33659, hash 8CAA78B3
+    data = length 70738, hash 3CBEFB41
   sample 69:
     time = 2299977
     flags = 1
-    data = length 33164, hash 611D5ED
+    data = length 70725, hash 439D70A0
   sample 70:
     time = 2333311
     flags = 1
-    data = length 33631, hash 7FC4E90C
+    data = length 70788, hash B83B828A
   sample 71:
     time = 2366644
     flags = 1
-    data = length 33157, hash 8C9BE824
+    data = length 70731, hash 42884A2B
   sample 72:
     time = 2399977
     flags = 1
-    data = length 33613, hash 8F56735C
+    data = length 70705, hash DCC1F08D
   sample 73:
     time = 2433311
     flags = 1
-    data = length 33130, hash FE728EAD
+    data = length 70676, hash 39CF1044
   sample 74:
     time = 2466644
     flags = 1
-    data = length 33589, hash 5AD12E53
+    data = length 70676, hash B4404B5E
   sample 75:
     time = 2499977
     flags = 1
-    data = length 33612, hash 40695796
+    data = length 70727, hash 1A465912
   sample 76:
     time = 2533311
     flags = 1
-    data = length 33134, hash B0122256
+    data = length 70813, hash DC08CB62
   sample 77:
     time = 2566644
     flags = 1
-    data = length 33590, hash 5787C725
+    data = length 70723, hash 92DA90EC
   sample 78:
     time = 2599977
     flags = 1
-    data = length 33595, hash 81B7A445
+    data = length 70656, hash 898E7F91
   sample 79:
     time = 2633311
     flags = 1
-    data = length 33562, hash 3B6CF24A
+    data = length 70642, hash 95CF9F57
   sample 80:
     time = 2666644
     flags = 1
-    data = length 33086, hash DFA77B90
+    data = length 70568, hash 4541E03E
   sample 81:
     time = 2699977
     flags = 1
-    data = length 33559, hash 7EE31196
+    data = length 70555, hash A6F9DCC8
   sample 82:
     time = 2733311
     flags = 1
-    data = length 33534, hash 1E533F20
+    data = length 70643, hash 3FFC9BB7
   sample 83:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 84:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 85:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 86:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 87:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 88:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 89:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 90:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 91:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 92:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 93:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 94:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 95:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 96:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 97:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 98:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 99:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 100:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 101:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 102:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 103:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 104:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 105:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 106:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 107:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 108:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 109:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 110:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 111:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 112:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 113:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 114:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 115:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 116:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 117:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 118:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 119:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 120:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 121:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 122:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 123:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/media/mp4/sample_with_apvc.mp4 b/libraries/test_data/src/test/assets/media/mp4/sample_with_apvc.mp4
index 3a66a8474d..f3dfe287d6 100644
Binary files a/libraries/test_data/src/test/assets/media/mp4/sample_with_apvc.mp4 and b/libraries/test_data/src/test/assets/media/mp4/sample_with_apvc.mp4 differ
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump
index 872921811f..ad2d6ee6af 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump
@@ -2,19 +2,19 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=400052]]
-  getPosition(1) = [[timeUs=0, position=400052], [timeUs=33333, position=446343]]
-  getPosition(2083300) = [[timeUs=2066644, position=2574107], [timeUs=2099977, position=2607712]]
-  getPosition(4166600) = [[timeUs=4133288, position=4644330]]
+  getPosition(1) = [[timeUs=0, position=400052], [timeUs=33333, position=452425]]
+  getPosition(2083300) = [[timeUs=2066644, position=4412149], [timeUs=2099977, position=4482397]]
+  getPosition(4166600) = [[timeUs=4133288, position=8785064]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 4277755
+  total output bytes = 8455938
   sample count = 125
   track duration = 4166600
   format 0:
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 46321
+    maxInputSize = 70970
     width = 640
     height = 480
     frameRate = 30.00
@@ -23,505 +23,505 @@ track 0:
       chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=100000000, modification time=500000000, timescale=10000]
     initializationData:
-      data = length 23, hash 7603C9E2
+      data = length 22, hash 5F550605
   sample 0:
     time = 0
     flags = 1
-    data = length 46291, hash F184D3EA
+    data = length 52373, hash 80FDAE9B
   sample 1:
     time = 33333
     flags = 1
-    data = length 45054, hash F206D4C7
+    data = length 53098, hash 15BB3540
   sample 2:
     time = 66666
     flags = 1
-    data = length 43917, hash 41AF8999
+    data = length 54177, hash 461C0D61
   sample 3:
     time = 100000
     flags = 1
-    data = length 42718, hash 3133C7AA
+    data = length 54942, hash 8AF2C3DA
   sample 4:
     time = 133333
     flags = 1
-    data = length 42073, hash 65FC45EF
+    data = length 55605, hash 988F3C3D
   sample 5:
     time = 166666
     flags = 1
-    data = length 41038, hash 7BD21D86
+    data = length 56867, hash A1C39A74
   sample 6:
     time = 200000
     flags = 1
-    data = length 40179, hash 9BCCCD79
+    data = length 57618, hash CC4751E6
   sample 7:
     time = 233333
     flags = 1
-    data = length 38738, hash B3D91D1B
+    data = length 58225, hash 53620F5C
   sample 8:
     time = 266666
     flags = 1
-    data = length 38176, hash FD0085E7
+    data = length 58799, hash 9C33BFA
   sample 9:
     time = 300000
     flags = 1
-    data = length 37326, hash 306F7E88
+    data = length 58973, hash 8C133C85
   sample 10:
     time = 333333
     flags = 1
-    data = length 36940, hash EE677695
+    data = length 59706, hash 9EE847FF
   sample 11:
     time = 366666
     flags = 1
-    data = length 36320, hash 3FCF3B37
+    data = length 60245, hash DCF1B3D6
   sample 12:
     time = 400000
     flags = 1
-    data = length 35664, hash A5C0C7CB
+    data = length 60813, hash 85E99B5D
   sample 13:
     time = 433333
     flags = 1
-    data = length 35666, hash F54C69A5
+    data = length 61121, hash 2F0AD0E6
   sample 14:
     time = 466666
     flags = 1
-    data = length 35300, hash 77430247
+    data = length 61587, hash 653FBFA1
   sample 15:
     time = 500000
     flags = 1
-    data = length 34693, hash BF72F842
+    data = length 61580, hash 7CD613C3
   sample 16:
     time = 533333
     flags = 1
-    data = length 34708, hash 881A49B1
+    data = length 62189, hash F965EBB5
   sample 17:
     time = 566655
     flags = 1
-    data = length 33840, hash 9A0CC574
+    data = length 62495, hash 15443B22
   sample 18:
     time = 599988
     flags = 1
-    data = length 33835, hash F85444D0
+    data = length 62803, hash 5CA16BEF
   sample 19:
     time = 633322
     flags = 1
-    data = length 33845, hash 4B29F464
+    data = length 62794, hash 6C4D3EC7
   sample 20:
     time = 666655
     flags = 1
-    data = length 33820, hash 3CDA4C6E
+    data = length 64256, hash 126F7DB3
   sample 21:
     time = 699988
     flags = 1
-    data = length 33815, hash 79E145BF
+    data = length 64779, hash B2307AE8
   sample 22:
     time = 733322
     flags = 1
-    data = length 33832, hash 584A281
+    data = length 64716, hash E630A72B
   sample 23:
     time = 766655
     flags = 1
-    data = length 33805, hash 9EA0615E
+    data = length 65023, hash 52D24B38
   sample 24:
     time = 799988
     flags = 1
-    data = length 33797, hash CC7BD45E
+    data = length 65015, hash 6226831B
   sample 25:
     time = 833322
     flags = 1
-    data = length 33476, hash E0627655
+    data = length 65810, hash 88053AB5
   sample 26:
     time = 866655
     flags = 1
-    data = length 33475, hash FBB3502A
+    data = length 65809, hash 881BEE3C
   sample 27:
     time = 899988
     flags = 1
-    data = length 33465, hash 619353FE
+    data = length 65756, hash CB2D0905
   sample 28:
     time = 933322
     flags = 1
-    data = length 33459, hash 93D6B187
+    data = length 65912, hash A811B27A
   sample 29:
     time = 966655
     flags = 1
-    data = length 33461, hash DF9982DC
+    data = length 65885, hash 4B94A886
   sample 30:
     time = 999988
     flags = 1
-    data = length 33449, hash 25E4D68E
+    data = length 66154, hash 9F2F7187
   sample 31:
     time = 1033322
     flags = 1
-    data = length 33432, hash F73FC227
+    data = length 66338, hash B1BA8F95
   sample 32:
     time = 1066655
     flags = 1
-    data = length 33419, hash B13787E3
+    data = length 67074, hash 51D243DC
   sample 33:
     time = 1099988
     flags = 1
-    data = length 33386, hash 788C2D32
+    data = length 66972, hash DBA1289
   sample 34:
     time = 1133322
     flags = 1
-    data = length 33727, hash 46D81267
+    data = length 66929, hash ADA3BDE5
   sample 35:
     time = 1166655
     flags = 1
-    data = length 33707, hash B5D58D87
+    data = length 66918, hash B8D5C472
   sample 36:
     time = 1199988
     flags = 1
-    data = length 33671, hash E7BAAE7F
+    data = length 66823, hash 88003D3D
   sample 37:
     time = 1233322
     flags = 1
-    data = length 33638, hash 18005555
+    data = length 67100, hash 7A917DF1
   sample 38:
     time = 1266655
     flags = 1
-    data = length 33593, hash 42021830
+    data = length 66888, hash 54F4444B
   sample 39:
     time = 1299988
     flags = 1
-    data = length 33569, hash D8029128
+    data = length 67473, hash 9CF0DCA8
   sample 40:
     time = 1333322
     flags = 1
-    data = length 33523, hash FB58F62
+    data = length 67891, hash C6E3A6E7
   sample 41:
     time = 1366655
     flags = 1
-    data = length 33497, hash 129B0638
+    data = length 67690, hash BDC36461
   sample 42:
     time = 1399988
     flags = 1
-    data = length 33473, hash 7A79A045
+    data = length 68105, hash BA880ECF
   sample 43:
     time = 1433322
     flags = 1
-    data = length 33445, hash 4E0CF40B
+    data = length 67986, hash A5B156AB
   sample 44:
     time = 1466655
     flags = 1
-    data = length 33418, hash 635FCB0
+    data = length 68031, hash 95AEA84D
   sample 45:
     time = 1499988
     flags = 1
-    data = length 33424, hash D2D749EE
+    data = length 68033, hash AB52B80B
   sample 46:
     time = 1533322
     flags = 1
-    data = length 33405, hash 5A62251E
+    data = length 68036, hash 433F6EBF
   sample 47:
     time = 1566655
     flags = 1
-    data = length 33403, hash 719C366
+    data = length 67986, hash 16B7182C
   sample 48:
     time = 1599988
     flags = 1
-    data = length 33422, hash 3ED7C42D
+    data = length 68121, hash 3A4729E7
   sample 49:
     time = 1633322
     flags = 1
-    data = length 33430, hash 7A8CA910
+    data = length 68193, hash 5FC954B9
   sample 50:
     time = 1666655
     flags = 1
-    data = length 33217, hash E28C94FD
+    data = length 68911, hash BF66396F
   sample 51:
     time = 1699977
     flags = 1
-    data = length 33263, hash 66DA3079
+    data = length 69017, hash E79975C4
   sample 52:
     time = 1733311
     flags = 1
-    data = length 33308, hash 7A7D0074
+    data = length 69073, hash DCD69C82
   sample 53:
     time = 1766644
     flags = 1
-    data = length 33340, hash C0B0CDEA
+    data = length 69101, hash 4BFBE937
   sample 54:
     time = 1799977
     flags = 1
-    data = length 33372, hash AB58ECF3
+    data = length 69261, hash BB3104F0
   sample 55:
     time = 1833311
     flags = 1
-    data = length 33436, hash AF2870E0
+    data = length 69290, hash 134D4EF5
   sample 56:
     time = 1866644
     flags = 1
-    data = length 33484, hash 5B399761
+    data = length 69721, hash 1CDB1A79
   sample 57:
     time = 1899977
     flags = 1
-    data = length 33533, hash 7C123CE2
+    data = length 69750, hash DC29D4B6
   sample 58:
     time = 1933311
     flags = 1
-    data = length 33577, hash 5B94935F
+    data = length 69783, hash 7EFB7D87
   sample 59:
     time = 1966644
     flags = 1
-    data = length 33615, hash 656D8603
+    data = length 70121, hash FF5B3636
   sample 60:
     time = 1999977
     flags = 1
-    data = length 33556, hash 68E72B55
+    data = length 70148, hash 8F4427
   sample 61:
     time = 2033311
     flags = 1
-    data = length 33597, hash FFB1545C
+    data = length 70209, hash A2920DE6
   sample 62:
     time = 2066644
     flags = 1
-    data = length 33605, hash 84DC1F1D
+    data = length 70248, hash 20957255
   sample 63:
     time = 2099977
     flags = 1
-    data = length 33144, hash 57E599D4
+    data = length 70265, hash 6D3B534E
   sample 64:
     time = 2133311
     flags = 1
-    data = length 33171, hash FB92ED17
+    data = length 70244, hash 280CAC31
   sample 65:
     time = 2166644
     flags = 1
-    data = length 33651, hash AF3A5151
+    data = length 70247, hash 9678FDF7
   sample 66:
     time = 2199977
     flags = 1
-    data = length 33174, hash C2094641
+    data = length 70284, hash A49FC5BB
   sample 67:
     time = 2233311
     flags = 1
-    data = length 33185, hash 17FC6A0
+    data = length 70306, hash 418532E0
   sample 68:
     time = 2266644
     flags = 1
-    data = length 33659, hash 8CAA78B3
+    data = length 70738, hash 3CBEFB41
   sample 69:
     time = 2299977
     flags = 1
-    data = length 33164, hash 611D5ED
+    data = length 70725, hash 439D70A0
   sample 70:
     time = 2333311
     flags = 1
-    data = length 33631, hash 7FC4E90C
+    data = length 70788, hash B83B828A
   sample 71:
     time = 2366644
     flags = 1
-    data = length 33157, hash 8C9BE824
+    data = length 70731, hash 42884A2B
   sample 72:
     time = 2399977
     flags = 1
-    data = length 33613, hash 8F56735C
+    data = length 70705, hash DCC1F08D
   sample 73:
     time = 2433311
     flags = 1
-    data = length 33130, hash FE728EAD
+    data = length 70676, hash 39CF1044
   sample 74:
     time = 2466644
     flags = 1
-    data = length 33589, hash 5AD12E53
+    data = length 70676, hash B4404B5E
   sample 75:
     time = 2499977
     flags = 1
-    data = length 33612, hash 40695796
+    data = length 70727, hash 1A465912
   sample 76:
     time = 2533311
     flags = 1
-    data = length 33134, hash B0122256
+    data = length 70813, hash DC08CB62
   sample 77:
     time = 2566644
     flags = 1
-    data = length 33590, hash 5787C725
+    data = length 70723, hash 92DA90EC
   sample 78:
     time = 2599977
     flags = 1
-    data = length 33595, hash 81B7A445
+    data = length 70656, hash 898E7F91
   sample 79:
     time = 2633311
     flags = 1
-    data = length 33562, hash 3B6CF24A
+    data = length 70642, hash 95CF9F57
   sample 80:
     time = 2666644
     flags = 1
-    data = length 33086, hash DFA77B90
+    data = length 70568, hash 4541E03E
   sample 81:
     time = 2699977
     flags = 1
-    data = length 33559, hash 7EE31196
+    data = length 70555, hash A6F9DCC8
   sample 82:
     time = 2733311
     flags = 1
-    data = length 33534, hash 1E533F20
+    data = length 70643, hash 3FFC9BB7
   sample 83:
     time = 2766644
     flags = 1
-    data = length 33535, hash EA10535
+    data = length 70491, hash 99BFAA3D
   sample 84:
     time = 2799966
     flags = 1
-    data = length 33522, hash AD85B29A
+    data = length 70458, hash 97CF33B
   sample 85:
     time = 2833300
     flags = 1
-    data = length 33482, hash 242C9D1
+    data = length 70706, hash 1A052477
   sample 86:
     time = 2866633
     flags = 1
-    data = length 33474, hash A5BA5430
+    data = length 70669, hash 96C09C7D
   sample 87:
     time = 2899966
     flags = 1
-    data = length 33453, hash 13A2FEFE
+    data = length 70651, hash 72477C02
   sample 88:
     time = 2933300
     flags = 1
-    data = length 33409, hash 5C8231F1
+    data = length 70577, hash 225D197C
   sample 89:
     time = 2966633
     flags = 1
-    data = length 33385, hash C38CC146
+    data = length 70605, hash A972DE56
   sample 90:
     time = 2999966
     flags = 1
-    data = length 33355, hash 950481DC
+    data = length 70521, hash DA71FAF5
   sample 91:
     time = 3033300
     flags = 1
-    data = length 33335, hash 2744D3BC
+    data = length 70477, hash 131F8ABB
   sample 92:
     time = 3066633
     flags = 1
-    data = length 33377, hash 67C4C0
+    data = length 70715, hash F0582FAD
   sample 93:
     time = 3099966
     flags = 1
-    data = length 33339, hash 746966D3
+    data = length 70719, hash 3D8029AC
   sample 94:
     time = 3133300
     flags = 1
-    data = length 33319, hash 1398764F
+    data = length 70644, hash ED0906C9
   sample 95:
     time = 3166633
     flags = 1
-    data = length 33287, hash 9E7473D0
+    data = length 70600, hash 9A1E6F38
   sample 96:
     time = 3199966
     flags = 1
-    data = length 33265, hash EEAF849B
+    data = length 70547, hash ABEFB5C4
   sample 97:
     time = 3233300
     flags = 1
-    data = length 33261, hash 8037846B
+    data = length 70590, hash 56D9992C
   sample 98:
     time = 3266633
     flags = 1
-    data = length 33226, hash 4F4FAA8D
+    data = length 70574, hash 1360EA60
   sample 99:
     time = 3299966
     flags = 1
-    data = length 33203, hash 20A984DE
+    data = length 70497, hash 28D62240
   sample 100:
     time = 3333300
     flags = 1
-    data = length 33588, hash F0F05CD1
+    data = length 70166, hash 9E6A271E
   sample 101:
     time = 3366633
     flags = 1
-    data = length 33594, hash A3257252
+    data = length 70225, hash 2A9CF7ED
   sample 102:
     time = 3399966
     flags = 1
-    data = length 33584, hash 54AC38AC
+    data = length 70221, hash E8A57CD1
   sample 103:
     time = 3433300
     flags = 1
-    data = length 33216, hash 7A5A33B9
+    data = length 70205, hash 82D113D4
   sample 104:
     time = 3466633
     flags = 1
-    data = length 33219, hash F1083DEC
+    data = length 70213, hash BD73319C
   sample 105:
     time = 3499966
     flags = 1
-    data = length 33592, hash 3BB94CA7
+    data = length 70241, hash E157E4DA
   sample 106:
     time = 3533300
     flags = 1
-    data = length 33227, hash 9E084D49
+    data = length 70226, hash 8C89534E
   sample 107:
     time = 3566633
     flags = 1
-    data = length 33244, hash CCAFE8CB
+    data = length 70263, hash B964ADBF
   sample 108:
     time = 3599966
     flags = 1
-    data = length 33250, hash 920EF3EA
+    data = length 70186, hash E4F0A21F
   sample 109:
     time = 3633300
     flags = 1
-    data = length 33278, hash D1089D1B
+    data = length 70310, hash 8CDA8756
   sample 110:
     time = 3666633
     flags = 1
-    data = length 33300, hash 2BED2033
+    data = length 70329, hash 11BD6E88
   sample 111:
     time = 3699966
     flags = 1
-    data = length 33321, hash FD2B6BE7
+    data = length 70345, hash D572647F
   sample 112:
     time = 3733300
     flags = 1
-    data = length 33337, hash F63EA811
+    data = length 70447, hash 6D39D1B7
   sample 113:
     time = 3766633
     flags = 1
-    data = length 33383, hash 9DAB8833
+    data = length 70436, hash 7861D0E6
   sample 114:
     time = 3799966
     flags = 1
-    data = length 33321, hash 55D58114
+    data = length 70490, hash A775962E
   sample 115:
     time = 3833300
     flags = 1
-    data = length 33347, hash 412B5794
+    data = length 70557, hash 4DC9B33B
   sample 116:
     time = 3866633
     flags = 1
-    data = length 33374, hash 283D32F9
+    data = length 70517, hash 66EF5707
   sample 117:
     time = 3899955
     flags = 1
-    data = length 33420, hash ADA33226
+    data = length 70659, hash FB76BE4A
   sample 118:
     time = 3933288
     flags = 1
-    data = length 33435, hash 483803AC
+    data = length 70693, hash 8D5E10F0
   sample 119:
     time = 3966622
     flags = 1
-    data = length 33469, hash EAEF9B95
+    data = length 70727, hash 54607CED
   sample 120:
     time = 3999955
     flags = 1
-    data = length 33507, hash CCD8AF2C
+    data = length 70814, hash D8E3244A
   sample 121:
     time = 4033288
     flags = 1
-    data = length 33509, hash 845D5587
+    data = length 70848, hash 98DDAA5B
   sample 122:
     time = 4066622
     flags = 1
-    data = length 33453, hash 28BF6F7F
+    data = length 70856, hash 3987A16
   sample 123:
     time = 4099955
     flags = 1
-    data = length 33483, hash A98EABD3
+    data = length 70940, hash EEAA31CD
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 33477, hash 404E7F2D
+    data = length 70926, hash 95538A45
 tracksEnded = true