Mp4Muxer: Update APV clip in test.

As [APV spec](https://github.com/AcademySoftwareFoundation/openapv/blob/main/readme/apv_isobmff.md#syntax-1) is updated, the current APV clip is replaced with latest
APV clip.

PiperOrigin-RevId: 747272127

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump

@@ -2,527 +2,527 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 8455938
+  total output bytes = 8456438
   sample count = 125
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 0
     flags = 1
-    data = length 52373, hash 80FDAE9B
+    data = length 52377, hash 2EF7468D
   sample 1:
     time = 33333
     flags = 1
-    data = length 53098, hash 15BB3540
+    data = length 53102, hash C76F8E
   sample 2:
     time = 66666
     flags = 1
-    data = length 54177, hash 461C0D61
+    data = length 54181, hash 59474D3
   sample 3:
     time = 100000
     flags = 1
-    data = length 54942, hash 8AF2C3DA
+    data = length 54946, hash 836C24A8
   sample 4:
     time = 133333
     flags = 1
-    data = length 55605, hash 988F3C3D
+    data = length 55609, hash 6EFF8DAF
   sample 5:
     time = 166666
     flags = 1
-    data = length 56867, hash A1C39A74
+    data = length 56871, hash C7F380E6
   sample 6:
     time = 200000
     flags = 1
-    data = length 57618, hash CC4751E6
+    data = length 57622, hash D1A46B34
   sample 7:
     time = 233333
     flags = 1
-    data = length 58225, hash 53620F5C
+    data = length 58229, hash 854542CE
   sample 8:
     time = 266666
     flags = 1
-    data = length 58799, hash 9C33BFA
+    data = length 58803, hash FCAE71EC
   sample 9:
     time = 300000
     flags = 1
-    data = length 58973, hash 8C133C85
+    data = length 58977, hash 5C729977
   sample 10:
     time = 333333
     flags = 1
-    data = length 59706, hash 9EE847FF
+    data = length 59710, hash 1FBDEB4D
   sample 11:
     time = 366666
     flags = 1
-    data = length 60245, hash DCF1B3D6
+    data = length 60249, hash 8BCC3448
   sample 12:
     time = 400000
     flags = 1
-    data = length 60813, hash 85E99B5D
+    data = length 60817, hash 2143E8CF
   sample 13:
     time = 433333
     flags = 1
-    data = length 61121, hash 2F0AD0E6
+    data = length 61125, hash 3BEC5AD8
   sample 14:
     time = 466666
     flags = 1
-    data = length 61587, hash 653FBFA1
+    data = length 61591, hash 1CE10913
   sample 15:
     time = 500000
     flags = 1
-    data = length 61580, hash 7CD613C3
+    data = length 61584, hash F1108211
   sample 16:
     time = 533333
     flags = 1
-    data = length 62189, hash F965EBB5
+    data = length 62193, hash F4F6E6A7
   sample 17:
     time = 566655
     flags = 1
-    data = length 62495, hash 15443B22
+    data = length 62499, hash 8FDB4D94
   sample 18:
     time = 599988
     flags = 1
-    data = length 62803, hash 5CA16BEF
+    data = length 62807, hash 53B5DAE1
   sample 19:
     time = 633322
     flags = 1
-    data = length 62794, hash 6C4D3EC7
+    data = length 62798, hash 2BF6A415
   sample 20:
     time = 666655
     flags = 1
-    data = length 64256, hash 126F7DB3
+    data = length 64260, hash 7C580C20
   sample 21:
     time = 699988
     flags = 1
-    data = length 64779, hash B2307AE8
+    data = length 64783, hash 8DD563DA
   sample 22:
     time = 733322
     flags = 1
-    data = length 64716, hash E630A72B
+    data = length 64720, hash 5B96AB79
   sample 23:
     time = 766655
     flags = 1
-    data = length 65023, hash 52D24B38
+    data = length 65027, hash 4DF6A92A
   sample 24:
     time = 799988
     flags = 1
-    data = length 65015, hash 6226831B
+    data = length 65019, hash E6B2F0D
   sample 25:
     time = 833322
     flags = 1
-    data = length 65810, hash 88053AB5
+    data = length 65814, hash 6EA87B83
   sample 26:
     time = 866655
     flags = 1
-    data = length 65809, hash 881BEE3C
+    data = length 65813, hash 1822432E
   sample 27:
     time = 899988
     flags = 1
-    data = length 65756, hash CB2D0905
+    data = length 65760, hash C63042D3
   sample 28:
     time = 933322
     flags = 1
-    data = length 65912, hash A811B27A
+    data = length 65916, hash 54355C8
   sample 29:
     time = 966655
     flags = 1
-    data = length 65885, hash 4B94A886
+    data = length 65889, hash 541ED878
   sample 30:
     time = 999988
     flags = 1
-    data = length 66154, hash 9F2F7187
+    data = length 66158, hash D51104D5
   sample 31:
     time = 1033322
     flags = 1
-    data = length 66338, hash B1BA8F95
+    data = length 66342, hash 5E05D63
   sample 32:
     time = 1066655
     flags = 1
-    data = length 67074, hash 51D243DC
+    data = length 67078, hash 62B9BF09
   sample 33:
     time = 1099988
     flags = 1
-    data = length 66972, hash DBA1289
+    data = length 66976, hash 11C8D6D7
   sample 34:
     time = 1133322
     flags = 1
-    data = length 66929, hash ADA3BDE5
+    data = length 66933, hash 42BD48D7
   sample 35:
     time = 1166655
     flags = 1
-    data = length 66918, hash B8D5C472
+    data = length 66922, hash 2F2F3A40
   sample 36:
     time = 1199988
     flags = 1
-    data = length 66823, hash 88003D3D
+    data = length 66827, hash 75E1AF
   sample 37:
     time = 1233322
     flags = 1
-    data = length 67100, hash 7A917DF1
+    data = length 67104, hash B8CC7ABF
   sample 38:
     time = 1266655
     flags = 1
-    data = length 66888, hash 54F4444B
+    data = length 66892, hash 961DF599
   sample 39:
     time = 1299988
     flags = 1
-    data = length 67473, hash 9CF0DCA8
+    data = length 67477, hash CEC61E9A
   sample 40:
     time = 1333322
     flags = 1
-    data = length 67891, hash C6E3A6E7
+    data = length 67895, hash 6E6BFC59
   sample 41:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 42:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 43:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 44:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 45:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 46:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 47:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 48:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 49:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 50:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 51:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 52:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 53:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 54:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 55:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 56:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 57:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 58:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 59:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 60:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 61:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 62:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 63:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 64:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 65:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 66:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 67:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 68:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 69:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 70:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 71:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 72:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 73:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 74:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 75:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 76:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 77:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 78:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 79:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 80:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 81:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 82:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 83:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 84:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 85:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 86:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 87:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 88:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 89:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 90:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 91:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 92:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 93:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 94:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 95:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 96:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 97:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 98:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 99:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 100:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 101:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 102:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 103:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 104:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 105:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 106:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 107:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 108:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 109:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 110:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 111:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 112:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 113:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 114:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 115:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 116:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 117:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 118:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 119:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 120:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 121:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 122:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 123:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump

@@ -2,363 +2,363 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 5890407
+  total output bytes = 5890743
   sample count = 84
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 1:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 2:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 3:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 4:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 5:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 6:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 7:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 8:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 9:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 10:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 11:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 12:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 13:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 14:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 15:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 16:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 17:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 18:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 19:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 20:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 21:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 22:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 23:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 24:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 25:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 26:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 27:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 28:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 29:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 30:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 31:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 32:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 33:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 34:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 35:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 36:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 37:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 38:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 39:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 40:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 41:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 42:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 43:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 44:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 45:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 46:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 47:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 48:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 49:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 50:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 51:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 52:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 53:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 54:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 55:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 56:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 57:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 58:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 59:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 60:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 61:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 62:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 63:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 64:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 65:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 66:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 67:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 68:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 69:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 70:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 71:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 72:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 73:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 74:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 75:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 76:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 77:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 78:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 79:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 80:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 81:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 82:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 83:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump

@@ -2,195 +2,195 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 2961881
+  total output bytes = 2962049
   sample count = 42
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 1:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 2:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 3:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 4:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 5:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 6:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 7:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 8:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 9:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 10:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 11:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 12:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 13:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 14:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 15:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 16:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 17:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 18:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 19:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 20:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 21:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 22:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 23:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 24:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 25:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 26:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 27:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 28:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 29:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 30:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 31:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 32:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 33:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 34:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 35:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 36:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 37:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 38:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 39:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 40:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 41:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump

@@ -2,31 +2,31 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 70926
+  total output bytes = 70930
   sample count = 1
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -2,527 +2,527 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 8455938
+  total output bytes = 8456438
   sample count = 125
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 0
     flags = 1
-    data = length 52373, hash 80FDAE9B
+    data = length 52377, hash 2EF7468D
   sample 1:
     time = 33333
     flags = 1
-    data = length 53098, hash 15BB3540
+    data = length 53102, hash C76F8E
   sample 2:
     time = 66666
     flags = 1
-    data = length 54177, hash 461C0D61
+    data = length 54181, hash 59474D3
   sample 3:
     time = 100000
     flags = 1
-    data = length 54942, hash 8AF2C3DA
+    data = length 54946, hash 836C24A8
   sample 4:
     time = 133333
     flags = 1
-    data = length 55605, hash 988F3C3D
+    data = length 55609, hash 6EFF8DAF
   sample 5:
     time = 166666
     flags = 1
-    data = length 56867, hash A1C39A74
+    data = length 56871, hash C7F380E6
   sample 6:
     time = 200000
     flags = 1
-    data = length 57618, hash CC4751E6
+    data = length 57622, hash D1A46B34
   sample 7:
     time = 233333
     flags = 1
-    data = length 58225, hash 53620F5C
+    data = length 58229, hash 854542CE
   sample 8:
     time = 266666
     flags = 1
-    data = length 58799, hash 9C33BFA
+    data = length 58803, hash FCAE71EC
   sample 9:
     time = 300000
     flags = 1
-    data = length 58973, hash 8C133C85
+    data = length 58977, hash 5C729977
   sample 10:
     time = 333333
     flags = 1
-    data = length 59706, hash 9EE847FF
+    data = length 59710, hash 1FBDEB4D
   sample 11:
     time = 366666
     flags = 1
-    data = length 60245, hash DCF1B3D6
+    data = length 60249, hash 8BCC3448
   sample 12:
     time = 400000
     flags = 1
-    data = length 60813, hash 85E99B5D
+    data = length 60817, hash 2143E8CF
   sample 13:
     time = 433333
     flags = 1
-    data = length 61121, hash 2F0AD0E6
+    data = length 61125, hash 3BEC5AD8
   sample 14:
     time = 466666
     flags = 1
-    data = length 61587, hash 653FBFA1
+    data = length 61591, hash 1CE10913
   sample 15:
     time = 500000
     flags = 1
-    data = length 61580, hash 7CD613C3
+    data = length 61584, hash F1108211
   sample 16:
     time = 533333
     flags = 1
-    data = length 62189, hash F965EBB5
+    data = length 62193, hash F4F6E6A7
   sample 17:
     time = 566655
     flags = 1
-    data = length 62495, hash 15443B22
+    data = length 62499, hash 8FDB4D94
   sample 18:
     time = 599988
     flags = 1
-    data = length 62803, hash 5CA16BEF
+    data = length 62807, hash 53B5DAE1
   sample 19:
     time = 633322
     flags = 1
-    data = length 62794, hash 6C4D3EC7
+    data = length 62798, hash 2BF6A415
   sample 20:
     time = 666655
     flags = 1
-    data = length 64256, hash 126F7DB3
+    data = length 64260, hash 7C580C20
   sample 21:
     time = 699988
     flags = 1
-    data = length 64779, hash B2307AE8
+    data = length 64783, hash 8DD563DA
   sample 22:
     time = 733322
     flags = 1
-    data = length 64716, hash E630A72B
+    data = length 64720, hash 5B96AB79
   sample 23:
     time = 766655
     flags = 1
-    data = length 65023, hash 52D24B38
+    data = length 65027, hash 4DF6A92A
   sample 24:
     time = 799988
     flags = 1
-    data = length 65015, hash 6226831B
+    data = length 65019, hash E6B2F0D
   sample 25:
     time = 833322
     flags = 1
-    data = length 65810, hash 88053AB5
+    data = length 65814, hash 6EA87B83
   sample 26:
     time = 866655
     flags = 1
-    data = length 65809, hash 881BEE3C
+    data = length 65813, hash 1822432E
   sample 27:
     time = 899988
     flags = 1
-    data = length 65756, hash CB2D0905
+    data = length 65760, hash C63042D3
   sample 28:
     time = 933322
     flags = 1
-    data = length 65912, hash A811B27A
+    data = length 65916, hash 54355C8
   sample 29:
     time = 966655
     flags = 1
-    data = length 65885, hash 4B94A886
+    data = length 65889, hash 541ED878
   sample 30:
     time = 999988
     flags = 1
-    data = length 66154, hash 9F2F7187
+    data = length 66158, hash D51104D5
   sample 31:
     time = 1033322
     flags = 1
-    data = length 66338, hash B1BA8F95
+    data = length 66342, hash 5E05D63
   sample 32:
     time = 1066655
     flags = 1
-    data = length 67074, hash 51D243DC
+    data = length 67078, hash 62B9BF09
   sample 33:
     time = 1099988
     flags = 1
-    data = length 66972, hash DBA1289
+    data = length 66976, hash 11C8D6D7
   sample 34:
     time = 1133322
     flags = 1
-    data = length 66929, hash ADA3BDE5
+    data = length 66933, hash 42BD48D7
   sample 35:
     time = 1166655
     flags = 1
-    data = length 66918, hash B8D5C472
+    data = length 66922, hash 2F2F3A40
   sample 36:
     time = 1199988
     flags = 1
-    data = length 66823, hash 88003D3D
+    data = length 66827, hash 75E1AF
   sample 37:
     time = 1233322
     flags = 1
-    data = length 67100, hash 7A917DF1
+    data = length 67104, hash B8CC7ABF
   sample 38:
     time = 1266655
     flags = 1
-    data = length 66888, hash 54F4444B
+    data = length 66892, hash 961DF599
   sample 39:
     time = 1299988
     flags = 1
-    data = length 67473, hash 9CF0DCA8
+    data = length 67477, hash CEC61E9A
   sample 40:
     time = 1333322
     flags = 1
-    data = length 67891, hash C6E3A6E7
+    data = length 67895, hash 6E6BFC59
   sample 41:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 42:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 43:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 44:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 45:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 46:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 47:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 48:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 49:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 50:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 51:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 52:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 53:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 54:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 55:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 56:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 57:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 58:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 59:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 60:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 61:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 62:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 63:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 64:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 65:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 66:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 67:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 68:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 69:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 70:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 71:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 72:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 73:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 74:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 75:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 76:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 77:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 78:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 79:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 80:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 81:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 82:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 83:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 84:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 85:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 86:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 87:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 88:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 89:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 90:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 91:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 92:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 93:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 94:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 95:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 96:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 97:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 98:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 99:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 100:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 101:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 102:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 103:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 104:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 105:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 106:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 107:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 108:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 109:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 110:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 111:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 112:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 113:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 114:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 115:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 116:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 117:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 118:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 119:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 120:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 121:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 122:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 123:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -2,363 +2,363 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 5890407
+  total output bytes = 5890743
   sample count = 84
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 1:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 2:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 3:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 4:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 5:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 6:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 7:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 8:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 9:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 10:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 11:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 12:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 13:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 14:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 15:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 16:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 17:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 18:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 19:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 20:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 21:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 22:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 23:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 24:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 25:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 26:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 27:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 28:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 29:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 30:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 31:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 32:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 33:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 34:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 35:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 36:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 37:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 38:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 39:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 40:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 41:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 42:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 43:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 44:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 45:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 46:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 47:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 48:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 49:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 50:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 51:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 52:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 53:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 54:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 55:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 56:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 57:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 58:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 59:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 60:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 61:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 62:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 63:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 64:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 65:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 66:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 67:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 68:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 69:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 70:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 71:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 72:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 73:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 74:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 75:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 76:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 77:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 78:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 79:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 80:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 81:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 82:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 83:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -2,195 +2,195 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 2961881
+  total output bytes = 2962049
   sample count = 42
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 1:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 2:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 3:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 4:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 5:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 6:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 7:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 8:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 9:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 10:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 11:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 12:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 13:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 14:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 15:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 16:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 17:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 18:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 19:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 20:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 21:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 22:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 23:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 24:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 25:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 26:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 27:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 28:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 29:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 30:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 31:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 32:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 33:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 34:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 35:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 36:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 37:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 38:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 39:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 40:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 41:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -2,31 +2,31 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 70926
+  total output bytes = 70930
   sample count = 1
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -2,527 +2,527 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 8455938
+  total output bytes = 8456438
   sample count = 125
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 0
     flags = 1
-    data = length 52373, hash 80FDAE9B
+    data = length 52377, hash 2EF7468D
   sample 1:
     time = 33333
     flags = 1
-    data = length 53098, hash 15BB3540
+    data = length 53102, hash C76F8E
   sample 2:
     time = 66666
     flags = 1
-    data = length 54177, hash 461C0D61
+    data = length 54181, hash 59474D3
   sample 3:
     time = 100000
     flags = 1
-    data = length 54942, hash 8AF2C3DA
+    data = length 54946, hash 836C24A8
   sample 4:
     time = 133333
     flags = 1
-    data = length 55605, hash 988F3C3D
+    data = length 55609, hash 6EFF8DAF
   sample 5:
     time = 166666
     flags = 1
-    data = length 56867, hash A1C39A74
+    data = length 56871, hash C7F380E6
   sample 6:
     time = 200000
     flags = 1
-    data = length 57618, hash CC4751E6
+    data = length 57622, hash D1A46B34
   sample 7:
     time = 233333
     flags = 1
-    data = length 58225, hash 53620F5C
+    data = length 58229, hash 854542CE
   sample 8:
     time = 266666
     flags = 1
-    data = length 58799, hash 9C33BFA
+    data = length 58803, hash FCAE71EC
   sample 9:
     time = 300000
     flags = 1
-    data = length 58973, hash 8C133C85
+    data = length 58977, hash 5C729977
   sample 10:
     time = 333333
     flags = 1
-    data = length 59706, hash 9EE847FF
+    data = length 59710, hash 1FBDEB4D
   sample 11:
     time = 366666
     flags = 1
-    data = length 60245, hash DCF1B3D6
+    data = length 60249, hash 8BCC3448
   sample 12:
     time = 400000
     flags = 1
-    data = length 60813, hash 85E99B5D
+    data = length 60817, hash 2143E8CF
   sample 13:
     time = 433333
     flags = 1
-    data = length 61121, hash 2F0AD0E6
+    data = length 61125, hash 3BEC5AD8
   sample 14:
     time = 466666
     flags = 1
-    data = length 61587, hash 653FBFA1
+    data = length 61591, hash 1CE10913
   sample 15:
     time = 500000
     flags = 1
-    data = length 61580, hash 7CD613C3
+    data = length 61584, hash F1108211
   sample 16:
     time = 533333
     flags = 1
-    data = length 62189, hash F965EBB5
+    data = length 62193, hash F4F6E6A7
   sample 17:
     time = 566655
     flags = 1
-    data = length 62495, hash 15443B22
+    data = length 62499, hash 8FDB4D94
   sample 18:
     time = 599988
     flags = 1
-    data = length 62803, hash 5CA16BEF
+    data = length 62807, hash 53B5DAE1
   sample 19:
     time = 633322
     flags = 1
-    data = length 62794, hash 6C4D3EC7
+    data = length 62798, hash 2BF6A415
   sample 20:
     time = 666655
     flags = 1
-    data = length 64256, hash 126F7DB3
+    data = length 64260, hash 7C580C20
   sample 21:
     time = 699988
     flags = 1
-    data = length 64779, hash B2307AE8
+    data = length 64783, hash 8DD563DA
   sample 22:
     time = 733322
     flags = 1
-    data = length 64716, hash E630A72B
+    data = length 64720, hash 5B96AB79
   sample 23:
     time = 766655
     flags = 1
-    data = length 65023, hash 52D24B38
+    data = length 65027, hash 4DF6A92A
   sample 24:
     time = 799988
     flags = 1
-    data = length 65015, hash 6226831B
+    data = length 65019, hash E6B2F0D
   sample 25:
     time = 833322
     flags = 1
-    data = length 65810, hash 88053AB5
+    data = length 65814, hash 6EA87B83
   sample 26:
     time = 866655
     flags = 1
-    data = length 65809, hash 881BEE3C
+    data = length 65813, hash 1822432E
   sample 27:
     time = 899988
     flags = 1
-    data = length 65756, hash CB2D0905
+    data = length 65760, hash C63042D3
   sample 28:
     time = 933322
     flags = 1
-    data = length 65912, hash A811B27A
+    data = length 65916, hash 54355C8
   sample 29:
     time = 966655
     flags = 1
-    data = length 65885, hash 4B94A886
+    data = length 65889, hash 541ED878
   sample 30:
     time = 999988
     flags = 1
-    data = length 66154, hash 9F2F7187
+    data = length 66158, hash D51104D5
   sample 31:
     time = 1033322
     flags = 1
-    data = length 66338, hash B1BA8F95
+    data = length 66342, hash 5E05D63
   sample 32:
     time = 1066655
     flags = 1
-    data = length 67074, hash 51D243DC
+    data = length 67078, hash 62B9BF09
   sample 33:
     time = 1099988
     flags = 1
-    data = length 66972, hash DBA1289
+    data = length 66976, hash 11C8D6D7
   sample 34:
     time = 1133322
     flags = 1
-    data = length 66929, hash ADA3BDE5
+    data = length 66933, hash 42BD48D7
   sample 35:
     time = 1166655
     flags = 1
-    data = length 66918, hash B8D5C472
+    data = length 66922, hash 2F2F3A40
   sample 36:
     time = 1199988
     flags = 1
-    data = length 66823, hash 88003D3D
+    data = length 66827, hash 75E1AF
   sample 37:
     time = 1233322
     flags = 1
-    data = length 67100, hash 7A917DF1
+    data = length 67104, hash B8CC7ABF
   sample 38:
     time = 1266655
     flags = 1
-    data = length 66888, hash 54F4444B
+    data = length 66892, hash 961DF599
   sample 39:
     time = 1299988
     flags = 1
-    data = length 67473, hash 9CF0DCA8
+    data = length 67477, hash CEC61E9A
   sample 40:
     time = 1333322
     flags = 1
-    data = length 67891, hash C6E3A6E7
+    data = length 67895, hash 6E6BFC59
   sample 41:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 42:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 43:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 44:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 45:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 46:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 47:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 48:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 49:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 50:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 51:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 52:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 53:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 54:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 55:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 56:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 57:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 58:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 59:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 60:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 61:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 62:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 63:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 64:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 65:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 66:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 67:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 68:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 69:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 70:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 71:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 72:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 73:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 74:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 75:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 76:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 77:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 78:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 79:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 80:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 81:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 82:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 83:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 84:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 85:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 86:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 87:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 88:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 89:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 90:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 91:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 92:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 93:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 94:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 95:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 96:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 97:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 98:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 99:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 100:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 101:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 102:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 103:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 104:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 105:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 106:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 107:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 108:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 109:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 110:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 111:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 112:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 113:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 114:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 115:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 116:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 117:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 118:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 119:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 120:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 121:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 122:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 123:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump

@@ -2,527 +2,527 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=40]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=40], [timeUs=33333, position=52417]]
+  getPosition(2083300) = [[timeUs=2066644, position=4012385], [timeUs=2099977, position=4082637]]
+  getPosition(4166600) = [[timeUs=4133288, position=8385548]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 8455938
+  total output bytes = 8456438
   sample count = 125
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
     colorInfo:
       lumaBitdepth = 10
       chromaBitdepth = 10
-    metadata = entries=[mdta: key=com.android.version, value=15, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3821418903, modification time=3821418903, timescale=10000]
+    metadata = entries=[mdta: key=com.android.version, value=16, xyz: latitude=0.0, longitude=-180.0, Mp4Timestamp: creation time=3825838182, modification time=3825838182, timescale=10000]
     initializationData:
       data = length 18, hash 77EBC81
   sample 0:
     time = 0
     flags = 1
-    data = length 52373, hash 80FDAE9B
+    data = length 52377, hash 2EF7468D
   sample 1:
     time = 33333
     flags = 1
-    data = length 53098, hash 15BB3540
+    data = length 53102, hash C76F8E
   sample 2:
     time = 66666
     flags = 1
-    data = length 54177, hash 461C0D61
+    data = length 54181, hash 59474D3
   sample 3:
     time = 100000
     flags = 1
-    data = length 54942, hash 8AF2C3DA
+    data = length 54946, hash 836C24A8
   sample 4:
     time = 133333
     flags = 1
-    data = length 55605, hash 988F3C3D
+    data = length 55609, hash 6EFF8DAF
   sample 5:
     time = 166666
     flags = 1
-    data = length 56867, hash A1C39A74
+    data = length 56871, hash C7F380E6
   sample 6:
     time = 200000
     flags = 1
-    data = length 57618, hash CC4751E6
+    data = length 57622, hash D1A46B34
   sample 7:
     time = 233333
     flags = 1
-    data = length 58225, hash 53620F5C
+    data = length 58229, hash 854542CE
   sample 8:
     time = 266666
     flags = 1
-    data = length 58799, hash 9C33BFA
+    data = length 58803, hash FCAE71EC
   sample 9:
     time = 300000
     flags = 1
-    data = length 58973, hash 8C133C85
+    data = length 58977, hash 5C729977
   sample 10:
     time = 333333
     flags = 1
-    data = length 59706, hash 9EE847FF
+    data = length 59710, hash 1FBDEB4D
   sample 11:
     time = 366666
     flags = 1
-    data = length 60245, hash DCF1B3D6
+    data = length 60249, hash 8BCC3448
   sample 12:
     time = 400000
     flags = 1
-    data = length 60813, hash 85E99B5D
+    data = length 60817, hash 2143E8CF
   sample 13:
     time = 433333
     flags = 1
-    data = length 61121, hash 2F0AD0E6
+    data = length 61125, hash 3BEC5AD8
   sample 14:
     time = 466666
     flags = 1
-    data = length 61587, hash 653FBFA1
+    data = length 61591, hash 1CE10913
   sample 15:
     time = 500000
     flags = 1
-    data = length 61580, hash 7CD613C3
+    data = length 61584, hash F1108211
   sample 16:
     time = 533333
     flags = 1
-    data = length 62189, hash F965EBB5
+    data = length 62193, hash F4F6E6A7
   sample 17:
     time = 566655
     flags = 1
-    data = length 62495, hash 15443B22
+    data = length 62499, hash 8FDB4D94
   sample 18:
     time = 599988
     flags = 1
-    data = length 62803, hash 5CA16BEF
+    data = length 62807, hash 53B5DAE1
   sample 19:
     time = 633322
     flags = 1
-    data = length 62794, hash 6C4D3EC7
+    data = length 62798, hash 2BF6A415
   sample 20:
     time = 666655
     flags = 1
-    data = length 64256, hash 126F7DB3
+    data = length 64260, hash 7C580C20
   sample 21:
     time = 699988
     flags = 1
-    data = length 64779, hash B2307AE8
+    data = length 64783, hash 8DD563DA
   sample 22:
     time = 733322
     flags = 1
-    data = length 64716, hash E630A72B
+    data = length 64720, hash 5B96AB79
   sample 23:
     time = 766655
     flags = 1
-    data = length 65023, hash 52D24B38
+    data = length 65027, hash 4DF6A92A
   sample 24:
     time = 799988
     flags = 1
-    data = length 65015, hash 6226831B
+    data = length 65019, hash E6B2F0D
   sample 25:
     time = 833322
     flags = 1
-    data = length 65810, hash 88053AB5
+    data = length 65814, hash 6EA87B83
   sample 26:
     time = 866655
     flags = 1
-    data = length 65809, hash 881BEE3C
+    data = length 65813, hash 1822432E
   sample 27:
     time = 899988
     flags = 1
-    data = length 65756, hash CB2D0905
+    data = length 65760, hash C63042D3
   sample 28:
     time = 933322
     flags = 1
-    data = length 65912, hash A811B27A
+    data = length 65916, hash 54355C8
   sample 29:
     time = 966655
     flags = 1
-    data = length 65885, hash 4B94A886
+    data = length 65889, hash 541ED878
   sample 30:
     time = 999988
     flags = 1
-    data = length 66154, hash 9F2F7187
+    data = length 66158, hash D51104D5
   sample 31:
     time = 1033322
     flags = 1
-    data = length 66338, hash B1BA8F95
+    data = length 66342, hash 5E05D63
   sample 32:
     time = 1066655
     flags = 1
-    data = length 67074, hash 51D243DC
+    data = length 67078, hash 62B9BF09
   sample 33:
     time = 1099988
     flags = 1
-    data = length 66972, hash DBA1289
+    data = length 66976, hash 11C8D6D7
   sample 34:
     time = 1133322
     flags = 1
-    data = length 66929, hash ADA3BDE5
+    data = length 66933, hash 42BD48D7
   sample 35:
     time = 1166655
     flags = 1
-    data = length 66918, hash B8D5C472
+    data = length 66922, hash 2F2F3A40
   sample 36:
     time = 1199988
     flags = 1
-    data = length 66823, hash 88003D3D
+    data = length 66827, hash 75E1AF
   sample 37:
     time = 1233322
     flags = 1
-    data = length 67100, hash 7A917DF1
+    data = length 67104, hash B8CC7ABF
   sample 38:
     time = 1266655
     flags = 1
-    data = length 66888, hash 54F4444B
+    data = length 66892, hash 961DF599
   sample 39:
     time = 1299988
     flags = 1
-    data = length 67473, hash 9CF0DCA8
+    data = length 67477, hash CEC61E9A
   sample 40:
     time = 1333322
     flags = 1
-    data = length 67891, hash C6E3A6E7
+    data = length 67895, hash 6E6BFC59
   sample 41:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 42:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 43:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 44:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 45:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 46:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 47:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 48:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 49:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 50:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 51:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 52:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 53:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 54:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 55:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 56:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 57:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 58:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 59:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 60:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 61:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 62:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 63:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 64:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 65:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 66:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 67:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 68:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 69:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 70:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 71:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 72:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 73:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 74:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 75:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 76:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 77:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 78:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 79:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 80:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 81:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 82:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 83:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 84:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 85:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 86:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 87:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 88:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 89:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 90:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 91:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 92:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 93:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 94:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 95:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 96:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 97:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 98:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 99:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 100:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 101:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 102:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 103:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 104:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 105:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 106:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 107:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 108:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 109:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 110:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 111:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 112:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 113:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 114:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 115:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 116:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 117:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 118:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 119:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 120:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 121:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 122:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 123:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump

@@ -2,20 +2,20 @@ seekMap:
   isSeekable = true
   duration = 4166600
   getPosition(0) = [[timeUs=0, position=400052]]
-  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]]
+  getPosition(1) = [[timeUs=0, position=400052], [timeUs=33333, position=452429]]
+  getPosition(2083300) = [[timeUs=2066644, position=4412397], [timeUs=2099977, position=4482649]]
+  getPosition(4166600) = [[timeUs=4133288, position=8785560]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 8455938
+  total output bytes = 8456438
   sample count = 125
   track duration = 4166600
   format 0:
-    averageBitrate = 16235575
+    averageBitrate = 16236535
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
-    maxInputSize = 70970
+    maxInputSize = 70974
     width = 640
     height = 480
     frameRate = 30.00
@@ -28,501 +28,501 @@ track 0:
   sample 0:
     time = 0
     flags = 1
-    data = length 52373, hash 80FDAE9B
+    data = length 52377, hash 2EF7468D
   sample 1:
     time = 33333
     flags = 1
-    data = length 53098, hash 15BB3540
+    data = length 53102, hash C76F8E
   sample 2:
     time = 66666
     flags = 1
-    data = length 54177, hash 461C0D61
+    data = length 54181, hash 59474D3
   sample 3:
     time = 100000
     flags = 1
-    data = length 54942, hash 8AF2C3DA
+    data = length 54946, hash 836C24A8
   sample 4:
     time = 133333
     flags = 1
-    data = length 55605, hash 988F3C3D
+    data = length 55609, hash 6EFF8DAF
   sample 5:
     time = 166666
     flags = 1
-    data = length 56867, hash A1C39A74
+    data = length 56871, hash C7F380E6
   sample 6:
     time = 200000
     flags = 1
-    data = length 57618, hash CC4751E6
+    data = length 57622, hash D1A46B34
   sample 7:
     time = 233333
     flags = 1
-    data = length 58225, hash 53620F5C
+    data = length 58229, hash 854542CE
   sample 8:
     time = 266666
     flags = 1
-    data = length 58799, hash 9C33BFA
+    data = length 58803, hash FCAE71EC
   sample 9:
     time = 300000
     flags = 1
-    data = length 58973, hash 8C133C85
+    data = length 58977, hash 5C729977
   sample 10:
     time = 333333
     flags = 1
-    data = length 59706, hash 9EE847FF
+    data = length 59710, hash 1FBDEB4D
   sample 11:
     time = 366666
     flags = 1
-    data = length 60245, hash DCF1B3D6
+    data = length 60249, hash 8BCC3448
   sample 12:
     time = 400000
     flags = 1
-    data = length 60813, hash 85E99B5D
+    data = length 60817, hash 2143E8CF
   sample 13:
     time = 433333
     flags = 1
-    data = length 61121, hash 2F0AD0E6
+    data = length 61125, hash 3BEC5AD8
   sample 14:
     time = 466666
     flags = 1
-    data = length 61587, hash 653FBFA1
+    data = length 61591, hash 1CE10913
   sample 15:
     time = 500000
     flags = 1
-    data = length 61580, hash 7CD613C3
+    data = length 61584, hash F1108211
   sample 16:
     time = 533333
     flags = 1
-    data = length 62189, hash F965EBB5
+    data = length 62193, hash F4F6E6A7
   sample 17:
     time = 566655
     flags = 1
-    data = length 62495, hash 15443B22
+    data = length 62499, hash 8FDB4D94
   sample 18:
     time = 599988
     flags = 1
-    data = length 62803, hash 5CA16BEF
+    data = length 62807, hash 53B5DAE1
   sample 19:
     time = 633322
     flags = 1
-    data = length 62794, hash 6C4D3EC7
+    data = length 62798, hash 2BF6A415
   sample 20:
     time = 666655
     flags = 1
-    data = length 64256, hash 126F7DB3
+    data = length 64260, hash 7C580C20
   sample 21:
     time = 699988
     flags = 1
-    data = length 64779, hash B2307AE8
+    data = length 64783, hash 8DD563DA
   sample 22:
     time = 733322
     flags = 1
-    data = length 64716, hash E630A72B
+    data = length 64720, hash 5B96AB79
   sample 23:
     time = 766655
     flags = 1
-    data = length 65023, hash 52D24B38
+    data = length 65027, hash 4DF6A92A
   sample 24:
     time = 799988
     flags = 1
-    data = length 65015, hash 6226831B
+    data = length 65019, hash E6B2F0D
   sample 25:
     time = 833322
     flags = 1
-    data = length 65810, hash 88053AB5
+    data = length 65814, hash 6EA87B83
   sample 26:
     time = 866655
     flags = 1
-    data = length 65809, hash 881BEE3C
+    data = length 65813, hash 1822432E
   sample 27:
     time = 899988
     flags = 1
-    data = length 65756, hash CB2D0905
+    data = length 65760, hash C63042D3
   sample 28:
     time = 933322
     flags = 1
-    data = length 65912, hash A811B27A
+    data = length 65916, hash 54355C8
   sample 29:
     time = 966655
     flags = 1
-    data = length 65885, hash 4B94A886
+    data = length 65889, hash 541ED878
   sample 30:
     time = 999988
     flags = 1
-    data = length 66154, hash 9F2F7187
+    data = length 66158, hash D51104D5
   sample 31:
     time = 1033322
     flags = 1
-    data = length 66338, hash B1BA8F95
+    data = length 66342, hash 5E05D63
   sample 32:
     time = 1066655
     flags = 1
-    data = length 67074, hash 51D243DC
+    data = length 67078, hash 62B9BF09
   sample 33:
     time = 1099988
     flags = 1
-    data = length 66972, hash DBA1289
+    data = length 66976, hash 11C8D6D7
   sample 34:
     time = 1133322
     flags = 1
-    data = length 66929, hash ADA3BDE5
+    data = length 66933, hash 42BD48D7
   sample 35:
     time = 1166655
     flags = 1
-    data = length 66918, hash B8D5C472
+    data = length 66922, hash 2F2F3A40
   sample 36:
     time = 1199988
     flags = 1
-    data = length 66823, hash 88003D3D
+    data = length 66827, hash 75E1AF
   sample 37:
     time = 1233322
     flags = 1
-    data = length 67100, hash 7A917DF1
+    data = length 67104, hash B8CC7ABF
   sample 38:
     time = 1266655
     flags = 1
-    data = length 66888, hash 54F4444B
+    data = length 66892, hash 961DF599
   sample 39:
     time = 1299988
     flags = 1
-    data = length 67473, hash 9CF0DCA8
+    data = length 67477, hash CEC61E9A
   sample 40:
     time = 1333322
     flags = 1
-    data = length 67891, hash C6E3A6E7
+    data = length 67895, hash 6E6BFC59
   sample 41:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 42:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 43:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 44:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 45:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 46:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 47:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 48:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 49:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 50:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 51:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 52:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 53:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 54:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 55:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 56:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 57:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 58:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 59:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 60:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 61:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 62:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 63:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 64:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 65:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 66:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 67:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 68:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 69:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 70:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 71:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 72:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 73:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 74:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 75:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 76:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 77:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 78:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 79:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 80:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 81:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 82:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 83:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 84:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 85:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 86:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 87:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 88:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 89:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 90:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 91:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 92:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 93:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 94:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 95:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 96:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 97:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 98:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 99:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 100:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 101:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 102:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 103:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 104:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 105:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 106:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 107:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 108:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 109:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 110:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 111:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 112:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 113:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 114:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 115:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 116:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 117:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 118:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 119:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 120:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 121:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 122:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 123:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 124:
     time = 4133288
     flags = 536870913
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true

libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4_fragmented.dump

@@ -4,7 +4,7 @@ seekMap:
   getPosition(0) = [[timeUs=0, position=672]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 8455938
+  total output bytes = 8456438
   sample count = 125
   format 0:
     id = 1
@@ -20,501 +20,501 @@ track 0:
   sample 0:
     time = 0
     flags = 1
-    data = length 52373, hash 80FDAE9B
+    data = length 52377, hash 2EF7468D
   sample 1:
     time = 33333
     flags = 1
-    data = length 53098, hash 15BB3540
+    data = length 53102, hash C76F8E
   sample 2:
     time = 66666
     flags = 1
-    data = length 54177, hash 461C0D61
+    data = length 54181, hash 59474D3
   sample 3:
     time = 100000
     flags = 1
-    data = length 54942, hash 8AF2C3DA
+    data = length 54946, hash 836C24A8
   sample 4:
     time = 133333
     flags = 1
-    data = length 55605, hash 988F3C3D
+    data = length 55609, hash 6EFF8DAF
   sample 5:
     time = 166666
     flags = 1
-    data = length 56867, hash A1C39A74
+    data = length 56871, hash C7F380E6
   sample 6:
     time = 200000
     flags = 1
-    data = length 57618, hash CC4751E6
+    data = length 57622, hash D1A46B34
   sample 7:
     time = 233333
     flags = 1
-    data = length 58225, hash 53620F5C
+    data = length 58229, hash 854542CE
   sample 8:
     time = 266666
     flags = 1
-    data = length 58799, hash 9C33BFA
+    data = length 58803, hash FCAE71EC
   sample 9:
     time = 300000
     flags = 1
-    data = length 58973, hash 8C133C85
+    data = length 58977, hash 5C729977
   sample 10:
     time = 333333
     flags = 1
-    data = length 59706, hash 9EE847FF
+    data = length 59710, hash 1FBDEB4D
   sample 11:
     time = 366666
     flags = 1
-    data = length 60245, hash DCF1B3D6
+    data = length 60249, hash 8BCC3448
   sample 12:
     time = 400000
     flags = 1
-    data = length 60813, hash 85E99B5D
+    data = length 60817, hash 2143E8CF
   sample 13:
     time = 433333
     flags = 1
-    data = length 61121, hash 2F0AD0E6
+    data = length 61125, hash 3BEC5AD8
   sample 14:
     time = 466666
     flags = 1
-    data = length 61587, hash 653FBFA1
+    data = length 61591, hash 1CE10913
   sample 15:
     time = 500000
     flags = 1
-    data = length 61580, hash 7CD613C3
+    data = length 61584, hash F1108211
   sample 16:
     time = 533333
     flags = 1
-    data = length 62189, hash F965EBB5
+    data = length 62193, hash F4F6E6A7
   sample 17:
     time = 566655
     flags = 1
-    data = length 62495, hash 15443B22
+    data = length 62499, hash 8FDB4D94
   sample 18:
     time = 599988
     flags = 1
-    data = length 62803, hash 5CA16BEF
+    data = length 62807, hash 53B5DAE1
   sample 19:
     time = 633322
     flags = 1
-    data = length 62794, hash 6C4D3EC7
+    data = length 62798, hash 2BF6A415
   sample 20:
     time = 666655
     flags = 1
-    data = length 64256, hash 126F7DB3
+    data = length 64260, hash 7C580C20
   sample 21:
     time = 699988
     flags = 1
-    data = length 64779, hash B2307AE8
+    data = length 64783, hash 8DD563DA
   sample 22:
     time = 733322
     flags = 1
-    data = length 64716, hash E630A72B
+    data = length 64720, hash 5B96AB79
   sample 23:
     time = 766655
     flags = 1
-    data = length 65023, hash 52D24B38
+    data = length 65027, hash 4DF6A92A
   sample 24:
     time = 799988
     flags = 1
-    data = length 65015, hash 6226831B
+    data = length 65019, hash E6B2F0D
   sample 25:
     time = 833322
     flags = 1
-    data = length 65810, hash 88053AB5
+    data = length 65814, hash 6EA87B83
   sample 26:
     time = 866655
     flags = 1
-    data = length 65809, hash 881BEE3C
+    data = length 65813, hash 1822432E
   sample 27:
     time = 899988
     flags = 1
-    data = length 65756, hash CB2D0905
+    data = length 65760, hash C63042D3
   sample 28:
     time = 933322
     flags = 1
-    data = length 65912, hash A811B27A
+    data = length 65916, hash 54355C8
   sample 29:
     time = 966655
     flags = 1
-    data = length 65885, hash 4B94A886
+    data = length 65889, hash 541ED878
   sample 30:
     time = 999988
     flags = 1
-    data = length 66154, hash 9F2F7187
+    data = length 66158, hash D51104D5
   sample 31:
     time = 1033322
     flags = 1
-    data = length 66338, hash B1BA8F95
+    data = length 66342, hash 5E05D63
   sample 32:
     time = 1066655
     flags = 1
-    data = length 67074, hash 51D243DC
+    data = length 67078, hash 62B9BF09
   sample 33:
     time = 1099988
     flags = 1
-    data = length 66972, hash DBA1289
+    data = length 66976, hash 11C8D6D7
   sample 34:
     time = 1133322
     flags = 1
-    data = length 66929, hash ADA3BDE5
+    data = length 66933, hash 42BD48D7
   sample 35:
     time = 1166655
     flags = 1
-    data = length 66918, hash B8D5C472
+    data = length 66922, hash 2F2F3A40
   sample 36:
     time = 1199988
     flags = 1
-    data = length 66823, hash 88003D3D
+    data = length 66827, hash 75E1AF
   sample 37:
     time = 1233322
     flags = 1
-    data = length 67100, hash 7A917DF1
+    data = length 67104, hash B8CC7ABF
   sample 38:
     time = 1266655
     flags = 1
-    data = length 66888, hash 54F4444B
+    data = length 66892, hash 961DF599
   sample 39:
     time = 1299988
     flags = 1
-    data = length 67473, hash 9CF0DCA8
+    data = length 67477, hash CEC61E9A
   sample 40:
     time = 1333322
     flags = 1
-    data = length 67891, hash C6E3A6E7
+    data = length 67895, hash 6E6BFC59
   sample 41:
     time = 1366655
     flags = 1
-    data = length 67690, hash BDC36461
+    data = length 67694, hash 73414AAF
   sample 42:
     time = 1399988
     flags = 1
-    data = length 68105, hash BA880ECF
+    data = length 68109, hash 22BCA541
   sample 43:
     time = 1433322
     flags = 1
-    data = length 67986, hash A5B156AB
+    data = length 67990, hash 7E8FBB79
   sample 44:
     time = 1466655
     flags = 1
-    data = length 68031, hash 95AEA84D
+    data = length 68035, hash 48C1A8BF
   sample 45:
     time = 1499988
     flags = 1
-    data = length 68033, hash AB52B80B
+    data = length 68037, hash 745994FD
   sample 46:
     time = 1533322
     flags = 1
-    data = length 68036, hash 433F6EBF
+    data = length 68040, hash 4675B0D
   sample 47:
     time = 1566655
     flags = 1
-    data = length 67986, hash 16B7182C
+    data = length 67990, hash EF957CFA
   sample 48:
     time = 1599988
     flags = 1
-    data = length 68121, hash 3A4729E7
+    data = length 68125, hash 596E2459
   sample 49:
     time = 1633322
     flags = 1
-    data = length 68193, hash 5FC954B9
+    data = length 68197, hash B612112B
   sample 50:
     time = 1666655
     flags = 1
-    data = length 68911, hash BF66396F
+    data = length 68915, hash A02893E1
   sample 51:
     time = 1699977
     flags = 1
-    data = length 69017, hash E79975C4
+    data = length 69021, hash 6DAAB6B6
   sample 52:
     time = 1733311
     flags = 1
-    data = length 69073, hash DCD69C82
+    data = length 69077, hash 35DBB74
   sample 53:
     time = 1766644
     flags = 1
-    data = length 69101, hash 4BFBE937
+    data = length 69105, hash 241B729
   sample 54:
     time = 1799977
     flags = 1
-    data = length 69261, hash BB3104F0
+    data = length 69265, hash 405EF262
   sample 55:
     time = 1833311
     flags = 1
-    data = length 69290, hash 134D4EF5
+    data = length 69294, hash 79C7843
   sample 56:
     time = 1866644
     flags = 1
-    data = length 69721, hash 1CDB1A79
+    data = length 69725, hash 4F02F1EB
   sample 57:
     time = 1899977
     flags = 1
-    data = length 69750, hash DC29D4B6
+    data = length 69754, hash 16291404
   sample 58:
     time = 1933311
     flags = 1
-    data = length 69783, hash 7EFB7D87
+    data = length 69787, hash 74642879
   sample 59:
     time = 1966644
     flags = 1
-    data = length 70121, hash FF5B3636
+    data = length 70125, hash 8A184928
   sample 60:
     time = 1999977
     flags = 1
-    data = length 70148, hash 8F4427
+    data = length 70152, hash FC413CF5
   sample 61:
     time = 2033311
     flags = 1
-    data = length 70209, hash A2920DE6
+    data = length 70213, hash 98B3BE58
   sample 62:
     time = 2066644
     flags = 1
-    data = length 70248, hash 20957255
+    data = length 70252, hash E1145A23
   sample 63:
     time = 2099977
     flags = 1
-    data = length 70265, hash 6D3B534E
+    data = length 70269, hash 347261C0
   sample 64:
     time = 2133311
     flags = 1
-    data = length 70244, hash 280CAC31
+    data = length 70248, hash 63134CFF
   sample 65:
     time = 2166644
     flags = 1
-    data = length 70247, hash 9678FDF7
+    data = length 70251, hash EDFC2BE9
   sample 66:
     time = 2199977
     flags = 1
-    data = length 70284, hash A49FC5BB
+    data = length 70288, hash BED92C89
   sample 67:
     time = 2233311
     flags = 1
-    data = length 70306, hash 418532E0
+    data = length 70310, hash 5406B02E
   sample 68:
     time = 2266644
     flags = 1
-    data = length 70738, hash 3CBEFB41
+    data = length 70742, hash 3D8DD8F
   sample 69:
     time = 2299977
     flags = 1
-    data = length 70725, hash 439D70A0
+    data = length 70729, hash 2120E912
   sample 70:
     time = 2333311
     flags = 1
-    data = length 70788, hash B83B828A
+    data = length 70792, hash 66750C58
   sample 71:
     time = 2366644
     flags = 1
-    data = length 70731, hash 42884A2B
+    data = length 70735, hash 4362F81D
   sample 72:
     time = 2399977
     flags = 1
-    data = length 70705, hash DCC1F08D
+    data = length 70709, hash 7602ABFF
   sample 73:
     time = 2433311
     flags = 1
-    data = length 70676, hash 39CF1044
+    data = length 70680, hash 4B2F5612
   sample 74:
     time = 2466644
     flags = 1
-    data = length 70676, hash B4404B5E
+    data = length 70680, hash C5A0912C
   sample 75:
     time = 2499977
     flags = 1
-    data = length 70727, hash 1A465912
+    data = length 70731, hash E06EE04
   sample 76:
     time = 2533311
     flags = 1
-    data = length 70813, hash DC08CB62
+    data = length 70817, hash BEE7E9D4
   sample 77:
     time = 2566644
     flags = 1
-    data = length 70723, hash 92DA90EC
+    data = length 70727, hash CDCB8CDE
   sample 78:
     time = 2599977
     flags = 1
-    data = length 70656, hash 898E7F91
+    data = length 70660, hash 4F35C9FE
   sample 79:
     time = 2633311
     flags = 1
-    data = length 70642, hash 95CF9F57
+    data = length 70646, hash CF60E125
   sample 80:
     time = 2666644
     flags = 1
-    data = length 70568, hash 4541E03E
+    data = length 70572, hash 261E908C
   sample 81:
     time = 2699977
     flags = 1
-    data = length 70555, hash A6F9DCC8
+    data = length 70559, hash 904DA73A
   sample 82:
     time = 2733311
     flags = 1
-    data = length 70643, hash 3FFC9BB7
+    data = length 70647, hash 7658C29
   sample 83:
     time = 2766644
     flags = 1
-    data = length 70491, hash 99BFAA3D
+    data = length 70495, hash 483A64AF
   sample 84:
     time = 2799966
     flags = 1
-    data = length 70458, hash 97CF33B
+    data = length 70462, hash 51487309
   sample 85:
     time = 2833300
     flags = 1
-    data = length 70706, hash 1A052477
+    data = length 70710, hash 702CCEC5
   sample 86:
     time = 2866633
     flags = 1
-    data = length 70669, hash 96C09C7D
+    data = length 70673, hash D0BEB6EF
   sample 87:
     time = 2899966
     flags = 1
-    data = length 70651, hash 72477C02
+    data = length 70655, hash 5CC59E74
   sample 88:
     time = 2933300
     flags = 1
-    data = length 70577, hash 225D197C
+    data = length 70581, hash DDF1BD6E
   sample 89:
     time = 2966633
     flags = 1
-    data = length 70605, hash A972DE56
+    data = length 70609, hash 68B4B148
   sample 90:
     time = 2999966
     flags = 1
-    data = length 70521, hash DA71FAF5
+    data = length 70525, hash 30C40E7
   sample 91:
     time = 3033300
     flags = 1
-    data = length 70477, hash 131F8ABB
+    data = length 70481, hash D92EBDAD
   sample 92:
     time = 3066633
     flags = 1
-    data = length 70715, hash F0582FAD
+    data = length 70719, hash D989799F
   sample 93:
     time = 3099966
     flags = 1
-    data = length 70719, hash 3D8029AC
+    data = length 70723, hash 54AC0C9E
   sample 94:
     time = 3133300
     flags = 1
-    data = length 70644, hash ED0906C9
+    data = length 70648, hash 1E2B3C17
   sample 95:
     time = 3166633
     flags = 1
-    data = length 70600, hash 9A1E6F38
+    data = length 70604, hash 32415786
   sample 96:
     time = 3199966
     flags = 1
-    data = length 70547, hash ABEFB5C4
+    data = length 70551, hash E6264E36
   sample 97:
     time = 3233300
     flags = 1
-    data = length 70590, hash 56D9992C
+    data = length 70594, hash AAB4BFFA
   sample 98:
     time = 3266633
     flags = 1
-    data = length 70574, hash 1360EA60
+    data = length 70578, hash 10C3F52E
   sample 99:
     time = 3299966
     flags = 1
-    data = length 70497, hash 28D62240
+    data = length 70501, hash 66DE5232
   sample 100:
     time = 3333300
     flags = 1
-    data = length 70166, hash 9E6A271E
+    data = length 70170, hash 1B6AAF6C
   sample 101:
     time = 3366633
     flags = 1
-    data = length 70225, hash 2A9CF7ED
+    data = length 70229, hash 3C050C5F
   sample 102:
     time = 3399966
     flags = 1
-    data = length 70221, hash E8A57CD1
+    data = length 70225, hash 815C3843
   sample 103:
     time = 3433300
     flags = 1
-    data = length 70205, hash 82D113D4
+    data = length 70209, hash 926B6B46
   sample 104:
     time = 3466633
     flags = 1
-    data = length 70213, hash BD73319C
+    data = length 70217, hash 7C6BB0E
   sample 105:
     time = 3499966
     flags = 1
-    data = length 70241, hash E157E4DA
+    data = length 70245, hash 38AE5D4C
   sample 106:
     time = 3533300
     flags = 1
-    data = length 70226, hash 8C89534E
+    data = length 70230, hash 5D96C49C
   sample 107:
     time = 3566633
     flags = 1
-    data = length 70263, hash B964ADBF
+    data = length 70267, hash 4B1D3FB1
   sample 108:
     time = 3599966
     flags = 1
-    data = length 70186, hash E4F0A21F
+    data = length 70190, hash 56814D6D
   sample 109:
     time = 3633300
     flags = 1
-    data = length 70310, hash 8CDA8756
+    data = length 70314, hash 8DE18BA4
   sample 110:
     time = 3666633
     flags = 1
-    data = length 70329, hash 11BD6E88
+    data = length 70333, hash F9958CFA
   sample 111:
     time = 3699966
     flags = 1
-    data = length 70345, hash D572647F
+    data = length 70349, hash 477CE6F1
   sample 112:
     time = 3733300
     flags = 1
-    data = length 70447, hash 6D39D1B7
+    data = length 70451, hash 8B63B929
   sample 113:
     time = 3766633
     flags = 1
-    data = length 70436, hash 7861D0E6
+    data = length 70440, hash EE1D1A34
   sample 114:
     time = 3799966
     flags = 1
-    data = length 70490, hash A775962E
+    data = length 70494, hash 278D4DFC
   sample 115:
     time = 3833300
     flags = 1
-    data = length 70557, hash 4DC9B33B
+    data = length 70561, hash 88B5A2D
   sample 116:
     time = 3866633
     flags = 1
-    data = length 70517, hash 66EF5707
+    data = length 70521, hash B37703F9
   sample 117:
     time = 3899955
     flags = 1
-    data = length 70659, hash FB76BE4A
+    data = length 70663, hash F4B7AA3D
   sample 118:
     time = 3933288
     flags = 1
-    data = length 70693, hash 8D5E10F0
+    data = length 70697, hash 3974C162
   sample 119:
     time = 3966622
     flags = 1
-    data = length 70727, hash 54607CED
+    data = length 70731, hash 482111DF
   sample 120:
     time = 3999955
     flags = 1
-    data = length 70814, hash D8E3244A
+    data = length 70818, hash 33C78B98
   sample 121:
     time = 4033288
     flags = 1
-    data = length 70848, hash 98DDAA5B
+    data = length 70852, hash C7515D29
   sample 122:
     time = 4066622
     flags = 1
-    data = length 70856, hash 3987A16
+    data = length 70860, hash 35E3AE4
   sample 123:
     time = 4099955
     flags = 1
-    data = length 70940, hash EEAA31CD
+    data = length 70944, hash 7A711E1B
   sample 124:
     time = 4133288
     flags = 1
-    data = length 70926, hash 95538A45
+    data = length 70930, hash 2CD9EE13
 tracksEnded = true