diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/VbriSeeker.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/VbriSeeker.java
index 56dadf8763..232f160bad 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/VbriSeeker.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/VbriSeeker.java
@@ -58,8 +58,8 @@ import androidx.media3.extractor.SeekPoint;
     }
     int sampleRate = mpegAudioHeader.sampleRate;
     long durationUs =
-        Util.scaleLargeTimestamp(
-            numFrames, C.MICROS_PER_SECOND * (sampleRate >= 32000 ? 1152 : 576), sampleRate);
+        Util.sampleCountToDurationUs(
+            ((long) numFrames * mpegAudioHeader.samplesPerFrame) - 1, sampleRate);
     int entryCount = frame.readUnsignedShort();
     int scale = frame.readUnsignedShort();
     int entrySize = frame.readUnsignedShort();
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.0.dump
index eef73c01f2..f76b5f9d18 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.0.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=1404000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=10413]]
-  getPosition(2808000) = [[timeUs=1404000, position=10413]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=1403989, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=10413]]
+  getPosition(2807979) = [[timeUs=1403989, position=10413]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.1.dump
index eef73c01f2..f76b5f9d18 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.1.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=1404000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=10413]]
-  getPosition(2808000) = [[timeUs=1404000, position=10413]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=1403989, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=10413]]
+  getPosition(2807979) = [[timeUs=1403989, position=10413]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.2.dump
index e35fb7f541..05cb272f2f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.2.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=1404000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=10413]]
-  getPosition(2808000) = [[timeUs=1404000, position=10413]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=1403989, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=10413]]
+  getPosition(2807979) = [[timeUs=1403989, position=10413]]
 numberOfTracks = 1
 track 0:
   total output bytes = 27888
   sample count = 88
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
@@ -19,355 +19,355 @@ track 0:
     sampleRate = 48000
     metadata = entries=[TSSE: description=null: values=[Lavf58.29.100]]
   sample 0:
-    time = 1404000
+    time = 1403989
     flags = 1
     data = length 336, hash 8C435F6A
   sample 1:
-    time = 1428000
+    time = 1427989
     flags = 1
     data = length 336, hash 60D3F80C
   sample 2:
-    time = 1452000
+    time = 1451989
     flags = 1
     data = length 336, hash DC15B68B
   sample 3:
-    time = 1476000
+    time = 1475989
     flags = 1
     data = length 288, hash FF3DF141
   sample 4:
-    time = 1500000
+    time = 1499989
     flags = 1
     data = length 336, hash A64B3042
   sample 5:
-    time = 1524000
+    time = 1523989
     flags = 1
     data = length 336, hash ACA622A1
   sample 6:
-    time = 1548000
+    time = 1547989
     flags = 1
     data = length 288, hash 3E34B8D4
   sample 7:
-    time = 1572000
+    time = 1571989
     flags = 1
     data = length 288, hash 9B96F72A
   sample 8:
-    time = 1596000
+    time = 1595989
     flags = 1
     data = length 336, hash E917C122
   sample 9:
-    time = 1620000
+    time = 1619989
     flags = 1
     data = length 336, hash 10ED1470
   sample 10:
-    time = 1644000
+    time = 1643989
     flags = 1
     data = length 288, hash 706B8A7C
   sample 11:
-    time = 1668000
+    time = 1667989
     flags = 1
     data = length 336, hash 71FFE4A0
   sample 12:
-    time = 1692000
+    time = 1691989
     flags = 1
     data = length 336, hash D4160463
   sample 13:
-    time = 1716000
+    time = 1715989
     flags = 1
     data = length 336, hash EC557B14
   sample 14:
-    time = 1740000
+    time = 1739989
     flags = 1
     data = length 288, hash 5598CF8B
   sample 15:
-    time = 1764000
+    time = 1763989
     flags = 1
     data = length 336, hash 7E0AB41
   sample 16:
-    time = 1788000
+    time = 1787989
     flags = 1
     data = length 336, hash 1C585FEF
   sample 17:
-    time = 1812000
+    time = 1811989
     flags = 1
     data = length 336, hash A4A4855E
   sample 18:
-    time = 1836000
+    time = 1835989
     flags = 1
     data = length 336, hash CECA51D3
   sample 19:
-    time = 1860000
+    time = 1859989
     flags = 1
     data = length 288, hash 2D362DC5
   sample 20:
-    time = 1884000
+    time = 1883989
     flags = 1
     data = length 336, hash 9EB2609D
   sample 21:
-    time = 1908000
+    time = 1907989
     flags = 1
     data = length 336, hash 28FFB3FE
   sample 22:
-    time = 1932000
+    time = 1931989
     flags = 1
     data = length 288, hash 2AA2D216
   sample 23:
-    time = 1956000
+    time = 1955989
     flags = 1
     data = length 336, hash CDBC7032
   sample 24:
-    time = 1980000
+    time = 1979989
     flags = 1
     data = length 336, hash 25B13FE7
   sample 25:
-    time = 2004000
+    time = 2003989
     flags = 1
     data = length 336, hash DB6BB1E
   sample 26:
-    time = 2028000
+    time = 2027989
     flags = 1
     data = length 336, hash EBE951F4
   sample 27:
-    time = 2052000
+    time = 2051989
     flags = 1
     data = length 288, hash 9E2EBFF7
   sample 28:
-    time = 2076000
+    time = 2075989
     flags = 1
     data = length 336, hash 36A7D455
   sample 29:
-    time = 2100000
+    time = 2099989
     flags = 1
     data = length 336, hash 84545F8C
   sample 30:
-    time = 2124000
+    time = 2123989
     flags = 1
     data = length 336, hash F66F3045
   sample 31:
-    time = 2148000
+    time = 2147989
     flags = 1
     data = length 576, hash 5AB089EA
   sample 32:
-    time = 2172000
+    time = 2171989
     flags = 1
     data = length 336, hash 8868086
   sample 33:
-    time = 2196000
+    time = 2195989
     flags = 1
     data = length 336, hash D5EB6D63
   sample 34:
-    time = 2220000
+    time = 2219989
     flags = 1
     data = length 288, hash 7A5374B7
   sample 35:
-    time = 2244000
+    time = 2243989
     flags = 1
     data = length 336, hash BEB27A75
   sample 36:
-    time = 2268000
+    time = 2267989
     flags = 1
     data = length 336, hash E251E0FD
   sample 37:
-    time = 2292000
+    time = 2291989
     flags = 1
     data = length 288, hash D54C970
   sample 38:
-    time = 2316000
+    time = 2315989
     flags = 1
     data = length 336, hash 52C473B9
   sample 39:
-    time = 2340000
+    time = 2339989
     flags = 1
     data = length 336, hash F5F13334
   sample 40:
-    time = 2364000
+    time = 2363989
     flags = 1
     data = length 480, hash A5F1E987
   sample 41:
-    time = 2388000
+    time = 2387989
     flags = 1
     data = length 288, hash 453A1267
   sample 42:
-    time = 2412000
+    time = 2411989
     flags = 1
     data = length 288, hash 7C6C2EA9
   sample 43:
-    time = 2436000
+    time = 2435989
     flags = 1
     data = length 336, hash F4BFECA4
   sample 44:
-    time = 2460000
+    time = 2459989
     flags = 1
     data = length 336, hash 751A395A
   sample 45:
-    time = 2484000
+    time = 2483989
     flags = 1
     data = length 336, hash EE38DB02
   sample 46:
-    time = 2508000
+    time = 2507989
     flags = 1
     data = length 336, hash F18837E2
   sample 47:
-    time = 2532000
+    time = 2531989
     flags = 1
     data = length 336, hash ED36B78E
   sample 48:
-    time = 2556000
+    time = 2555989
     flags = 1
     data = length 336, hash B3D28289
   sample 49:
-    time = 2580000
+    time = 2579989
     flags = 1
     data = length 288, hash 8BDE28E1
   sample 50:
-    time = 2604000
+    time = 2603989
     flags = 1
     data = length 336, hash CFD5E966
   sample 51:
-    time = 2628000
+    time = 2627989
     flags = 1
     data = length 288, hash DC08E267
   sample 52:
-    time = 2652000
+    time = 2651989
     flags = 1
     data = length 336, hash 6530CB78
   sample 53:
-    time = 2676000
+    time = 2675989
     flags = 1
     data = length 336, hash 6CC6636E
   sample 54:
-    time = 2700000
+    time = 2699989
     flags = 1
     data = length 336, hash 613047C1
   sample 55:
-    time = 2724000
+    time = 2723989
     flags = 1
     data = length 288, hash CDC747BF
   sample 56:
-    time = 2748000
+    time = 2747989
     flags = 1
     data = length 336, hash AF22AA74
   sample 57:
-    time = 2772000
+    time = 2771989
     flags = 1
     data = length 384, hash 82F326AA
   sample 58:
-    time = 2796000
+    time = 2795989
     flags = 1
     data = length 384, hash EDA26C4D
   sample 59:
-    time = 2820000
+    time = 2819989
     flags = 1
     data = length 336, hash 94C643DC
   sample 60:
-    time = 2844000
+    time = 2843989
     flags = 1
     data = length 288, hash CB5D9C40
   sample 61:
-    time = 2868000
+    time = 2867989
     flags = 1
     data = length 336, hash 1E69DE3F
   sample 62:
-    time = 2892000
+    time = 2891989
     flags = 1
     data = length 336, hash 7E472219
   sample 63:
-    time = 2916000
+    time = 2915989
     flags = 1
     data = length 336, hash DA47B9FA
   sample 64:
-    time = 2940000
+    time = 2939989
     flags = 1
     data = length 336, hash DD0ABB7C
   sample 65:
-    time = 2964000
+    time = 2963989
     flags = 1
     data = length 288, hash DBF93FAC
   sample 66:
-    time = 2988000
+    time = 2987989
     flags = 1
     data = length 336, hash 243F4B2
   sample 67:
-    time = 3012000
+    time = 3011989
     flags = 1
     data = length 336, hash 2E881490
   sample 68:
-    time = 3036000
+    time = 3035989
     flags = 1
     data = length 288, hash 1C28C8BE
   sample 69:
-    time = 3060000
+    time = 3059989
     flags = 1
     data = length 336, hash C73E5D30
   sample 70:
-    time = 3084000
+    time = 3083989
     flags = 1
     data = length 288, hash 98B5BFF6
   sample 71:
-    time = 3108000
+    time = 3107989
     flags = 1
     data = length 336, hash E0135533
   sample 72:
-    time = 3132000
+    time = 3131989
     flags = 1
     data = length 336, hash D13C9DBC
   sample 73:
-    time = 3156000
+    time = 3155989
     flags = 1
     data = length 336, hash 63D524CA
   sample 74:
-    time = 3180000
+    time = 3179989
     flags = 1
     data = length 288, hash A28514C3
   sample 75:
-    time = 3204000
+    time = 3203989
     flags = 1
     data = length 336, hash 72B647FF
   sample 76:
-    time = 3228000
+    time = 3227989
     flags = 1
     data = length 336, hash 8F740AB1
   sample 77:
-    time = 3252000
+    time = 3251989
     flags = 1
     data = length 336, hash 5E3C7E93
   sample 78:
-    time = 3276000
+    time = 3275989
     flags = 1
     data = length 336, hash 121B913B
   sample 79:
-    time = 3300000
+    time = 3299989
     flags = 1
     data = length 336, hash 578FCCF2
   sample 80:
-    time = 3324000
+    time = 3323989
     flags = 1
     data = length 336, hash 5B5823DE
   sample 81:
-    time = 3348000
+    time = 3347989
     flags = 1
     data = length 384, hash D8B83F78
   sample 82:
-    time = 3372000
+    time = 3371989
     flags = 1
     data = length 240, hash E649682F
   sample 83:
-    time = 3396000
+    time = 3395989
     flags = 1
     data = length 96, hash C559A6F4
   sample 84:
-    time = 3420000
+    time = 3419989
     flags = 1
     data = length 96, hash 792796BC
   sample 85:
-    time = 3444000
+    time = 3443989
     flags = 1
     data = length 120, hash 8172CD0E
   sample 86:
-    time = 3468000
+    time = 3467989
     flags = 1
     data = length 120, hash F562B52F
   sample 87:
-    time = 3492000
+    time = 3491989
     flags = 1
     data = length 96, hash FF8D5B98
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.3.dump
index e35fb7f541..05cb272f2f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.3.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=1404000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=10413]]
-  getPosition(2808000) = [[timeUs=1404000, position=10413]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=1403989, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=10413]]
+  getPosition(2807979) = [[timeUs=1403989, position=10413]]
 numberOfTracks = 1
 track 0:
   total output bytes = 27888
   sample count = 88
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
@@ -19,355 +19,355 @@ track 0:
     sampleRate = 48000
     metadata = entries=[TSSE: description=null: values=[Lavf58.29.100]]
   sample 0:
-    time = 1404000
+    time = 1403989
     flags = 1
     data = length 336, hash 8C435F6A
   sample 1:
-    time = 1428000
+    time = 1427989
     flags = 1
     data = length 336, hash 60D3F80C
   sample 2:
-    time = 1452000
+    time = 1451989
     flags = 1
     data = length 336, hash DC15B68B
   sample 3:
-    time = 1476000
+    time = 1475989
     flags = 1
     data = length 288, hash FF3DF141
   sample 4:
-    time = 1500000
+    time = 1499989
     flags = 1
     data = length 336, hash A64B3042
   sample 5:
-    time = 1524000
+    time = 1523989
     flags = 1
     data = length 336, hash ACA622A1
   sample 6:
-    time = 1548000
+    time = 1547989
     flags = 1
     data = length 288, hash 3E34B8D4
   sample 7:
-    time = 1572000
+    time = 1571989
     flags = 1
     data = length 288, hash 9B96F72A
   sample 8:
-    time = 1596000
+    time = 1595989
     flags = 1
     data = length 336, hash E917C122
   sample 9:
-    time = 1620000
+    time = 1619989
     flags = 1
     data = length 336, hash 10ED1470
   sample 10:
-    time = 1644000
+    time = 1643989
     flags = 1
     data = length 288, hash 706B8A7C
   sample 11:
-    time = 1668000
+    time = 1667989
     flags = 1
     data = length 336, hash 71FFE4A0
   sample 12:
-    time = 1692000
+    time = 1691989
     flags = 1
     data = length 336, hash D4160463
   sample 13:
-    time = 1716000
+    time = 1715989
     flags = 1
     data = length 336, hash EC557B14
   sample 14:
-    time = 1740000
+    time = 1739989
     flags = 1
     data = length 288, hash 5598CF8B
   sample 15:
-    time = 1764000
+    time = 1763989
     flags = 1
     data = length 336, hash 7E0AB41
   sample 16:
-    time = 1788000
+    time = 1787989
     flags = 1
     data = length 336, hash 1C585FEF
   sample 17:
-    time = 1812000
+    time = 1811989
     flags = 1
     data = length 336, hash A4A4855E
   sample 18:
-    time = 1836000
+    time = 1835989
     flags = 1
     data = length 336, hash CECA51D3
   sample 19:
-    time = 1860000
+    time = 1859989
     flags = 1
     data = length 288, hash 2D362DC5
   sample 20:
-    time = 1884000
+    time = 1883989
     flags = 1
     data = length 336, hash 9EB2609D
   sample 21:
-    time = 1908000
+    time = 1907989
     flags = 1
     data = length 336, hash 28FFB3FE
   sample 22:
-    time = 1932000
+    time = 1931989
     flags = 1
     data = length 288, hash 2AA2D216
   sample 23:
-    time = 1956000
+    time = 1955989
     flags = 1
     data = length 336, hash CDBC7032
   sample 24:
-    time = 1980000
+    time = 1979989
     flags = 1
     data = length 336, hash 25B13FE7
   sample 25:
-    time = 2004000
+    time = 2003989
     flags = 1
     data = length 336, hash DB6BB1E
   sample 26:
-    time = 2028000
+    time = 2027989
     flags = 1
     data = length 336, hash EBE951F4
   sample 27:
-    time = 2052000
+    time = 2051989
     flags = 1
     data = length 288, hash 9E2EBFF7
   sample 28:
-    time = 2076000
+    time = 2075989
     flags = 1
     data = length 336, hash 36A7D455
   sample 29:
-    time = 2100000
+    time = 2099989
     flags = 1
     data = length 336, hash 84545F8C
   sample 30:
-    time = 2124000
+    time = 2123989
     flags = 1
     data = length 336, hash F66F3045
   sample 31:
-    time = 2148000
+    time = 2147989
     flags = 1
     data = length 576, hash 5AB089EA
   sample 32:
-    time = 2172000
+    time = 2171989
     flags = 1
     data = length 336, hash 8868086
   sample 33:
-    time = 2196000
+    time = 2195989
     flags = 1
     data = length 336, hash D5EB6D63
   sample 34:
-    time = 2220000
+    time = 2219989
     flags = 1
     data = length 288, hash 7A5374B7
   sample 35:
-    time = 2244000
+    time = 2243989
     flags = 1
     data = length 336, hash BEB27A75
   sample 36:
-    time = 2268000
+    time = 2267989
     flags = 1
     data = length 336, hash E251E0FD
   sample 37:
-    time = 2292000
+    time = 2291989
     flags = 1
     data = length 288, hash D54C970
   sample 38:
-    time = 2316000
+    time = 2315989
     flags = 1
     data = length 336, hash 52C473B9
   sample 39:
-    time = 2340000
+    time = 2339989
     flags = 1
     data = length 336, hash F5F13334
   sample 40:
-    time = 2364000
+    time = 2363989
     flags = 1
     data = length 480, hash A5F1E987
   sample 41:
-    time = 2388000
+    time = 2387989
     flags = 1
     data = length 288, hash 453A1267
   sample 42:
-    time = 2412000
+    time = 2411989
     flags = 1
     data = length 288, hash 7C6C2EA9
   sample 43:
-    time = 2436000
+    time = 2435989
     flags = 1
     data = length 336, hash F4BFECA4
   sample 44:
-    time = 2460000
+    time = 2459989
     flags = 1
     data = length 336, hash 751A395A
   sample 45:
-    time = 2484000
+    time = 2483989
     flags = 1
     data = length 336, hash EE38DB02
   sample 46:
-    time = 2508000
+    time = 2507989
     flags = 1
     data = length 336, hash F18837E2
   sample 47:
-    time = 2532000
+    time = 2531989
     flags = 1
     data = length 336, hash ED36B78E
   sample 48:
-    time = 2556000
+    time = 2555989
     flags = 1
     data = length 336, hash B3D28289
   sample 49:
-    time = 2580000
+    time = 2579989
     flags = 1
     data = length 288, hash 8BDE28E1
   sample 50:
-    time = 2604000
+    time = 2603989
     flags = 1
     data = length 336, hash CFD5E966
   sample 51:
-    time = 2628000
+    time = 2627989
     flags = 1
     data = length 288, hash DC08E267
   sample 52:
-    time = 2652000
+    time = 2651989
     flags = 1
     data = length 336, hash 6530CB78
   sample 53:
-    time = 2676000
+    time = 2675989
     flags = 1
     data = length 336, hash 6CC6636E
   sample 54:
-    time = 2700000
+    time = 2699989
     flags = 1
     data = length 336, hash 613047C1
   sample 55:
-    time = 2724000
+    time = 2723989
     flags = 1
     data = length 288, hash CDC747BF
   sample 56:
-    time = 2748000
+    time = 2747989
     flags = 1
     data = length 336, hash AF22AA74
   sample 57:
-    time = 2772000
+    time = 2771989
     flags = 1
     data = length 384, hash 82F326AA
   sample 58:
-    time = 2796000
+    time = 2795989
     flags = 1
     data = length 384, hash EDA26C4D
   sample 59:
-    time = 2820000
+    time = 2819989
     flags = 1
     data = length 336, hash 94C643DC
   sample 60:
-    time = 2844000
+    time = 2843989
     flags = 1
     data = length 288, hash CB5D9C40
   sample 61:
-    time = 2868000
+    time = 2867989
     flags = 1
     data = length 336, hash 1E69DE3F
   sample 62:
-    time = 2892000
+    time = 2891989
     flags = 1
     data = length 336, hash 7E472219
   sample 63:
-    time = 2916000
+    time = 2915989
     flags = 1
     data = length 336, hash DA47B9FA
   sample 64:
-    time = 2940000
+    time = 2939989
     flags = 1
     data = length 336, hash DD0ABB7C
   sample 65:
-    time = 2964000
+    time = 2963989
     flags = 1
     data = length 288, hash DBF93FAC
   sample 66:
-    time = 2988000
+    time = 2987989
     flags = 1
     data = length 336, hash 243F4B2
   sample 67:
-    time = 3012000
+    time = 3011989
     flags = 1
     data = length 336, hash 2E881490
   sample 68:
-    time = 3036000
+    time = 3035989
     flags = 1
     data = length 288, hash 1C28C8BE
   sample 69:
-    time = 3060000
+    time = 3059989
     flags = 1
     data = length 336, hash C73E5D30
   sample 70:
-    time = 3084000
+    time = 3083989
     flags = 1
     data = length 288, hash 98B5BFF6
   sample 71:
-    time = 3108000
+    time = 3107989
     flags = 1
     data = length 336, hash E0135533
   sample 72:
-    time = 3132000
+    time = 3131989
     flags = 1
     data = length 336, hash D13C9DBC
   sample 73:
-    time = 3156000
+    time = 3155989
     flags = 1
     data = length 336, hash 63D524CA
   sample 74:
-    time = 3180000
+    time = 3179989
     flags = 1
     data = length 288, hash A28514C3
   sample 75:
-    time = 3204000
+    time = 3203989
     flags = 1
     data = length 336, hash 72B647FF
   sample 76:
-    time = 3228000
+    time = 3227989
     flags = 1
     data = length 336, hash 8F740AB1
   sample 77:
-    time = 3252000
+    time = 3251989
     flags = 1
     data = length 336, hash 5E3C7E93
   sample 78:
-    time = 3276000
+    time = 3275989
     flags = 1
     data = length 336, hash 121B913B
   sample 79:
-    time = 3300000
+    time = 3299989
     flags = 1
     data = length 336, hash 578FCCF2
   sample 80:
-    time = 3324000
+    time = 3323989
     flags = 1
     data = length 336, hash 5B5823DE
   sample 81:
-    time = 3348000
+    time = 3347989
     flags = 1
     data = length 384, hash D8B83F78
   sample 82:
-    time = 3372000
+    time = 3371989
     flags = 1
     data = length 240, hash E649682F
   sample 83:
-    time = 3396000
+    time = 3395989
     flags = 1
     data = length 96, hash C559A6F4
   sample 84:
-    time = 3420000
+    time = 3419989
     flags = 1
     data = length 96, hash 792796BC
   sample 85:
-    time = 3444000
+    time = 3443989
     flags = 1
     data = length 120, hash 8172CD0E
   sample 86:
-    time = 3468000
+    time = 3467989
     flags = 1
     data = length 120, hash F562B52F
   sample 87:
-    time = 3492000
+    time = 3491989
     flags = 1
     data = length 96, hash FF8D5B98
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.unknown_length.dump
index eef73c01f2..f76b5f9d18 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header-truncated-toc.mp3.unknown_length.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=1404000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=10413]]
-  getPosition(2808000) = [[timeUs=1404000, position=10413]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=1403989, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=10413]]
+  getPosition(2807979) = [[timeUs=1403989, position=10413]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.0.dump
index dad37edeef..9bbdfa0402 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.0.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=702000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=19773]]
-  getPosition(2808000) = [[timeUs=2106000, position=29613]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=701994, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=19773]]
+  getPosition(2807979) = [[timeUs=2105984, position=29613]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.1.dump
index c83d8519c9..0c709cfaea 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.1.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=702000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=19773]]
-  getPosition(2808000) = [[timeUs=2106000, position=29613]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=701994, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=19773]]
+  getPosition(2807979) = [[timeUs=2105984, position=29613]]
 numberOfTracks = 1
 track 0:
   total output bytes = 27888
   sample count = 88
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
@@ -19,355 +19,355 @@ track 0:
     sampleRate = 48000
     metadata = entries=[TSSE: description=null: values=[Lavf58.29.100]]
   sample 0:
-    time = 702000
+    time = 701994
     flags = 1
     data = length 336, hash 8C435F6A
   sample 1:
-    time = 726000
+    time = 725994
     flags = 1
     data = length 336, hash 60D3F80C
   sample 2:
-    time = 750000
+    time = 749994
     flags = 1
     data = length 336, hash DC15B68B
   sample 3:
-    time = 774000
+    time = 773994
     flags = 1
     data = length 288, hash FF3DF141
   sample 4:
-    time = 798000
+    time = 797994
     flags = 1
     data = length 336, hash A64B3042
   sample 5:
-    time = 822000
+    time = 821994
     flags = 1
     data = length 336, hash ACA622A1
   sample 6:
-    time = 846000
+    time = 845994
     flags = 1
     data = length 288, hash 3E34B8D4
   sample 7:
-    time = 870000
+    time = 869994
     flags = 1
     data = length 288, hash 9B96F72A
   sample 8:
-    time = 894000
+    time = 893994
     flags = 1
     data = length 336, hash E917C122
   sample 9:
-    time = 918000
+    time = 917994
     flags = 1
     data = length 336, hash 10ED1470
   sample 10:
-    time = 942000
+    time = 941994
     flags = 1
     data = length 288, hash 706B8A7C
   sample 11:
-    time = 966000
+    time = 965994
     flags = 1
     data = length 336, hash 71FFE4A0
   sample 12:
-    time = 990000
+    time = 989994
     flags = 1
     data = length 336, hash D4160463
   sample 13:
-    time = 1014000
+    time = 1013994
     flags = 1
     data = length 336, hash EC557B14
   sample 14:
-    time = 1038000
+    time = 1037994
     flags = 1
     data = length 288, hash 5598CF8B
   sample 15:
-    time = 1062000
+    time = 1061994
     flags = 1
     data = length 336, hash 7E0AB41
   sample 16:
-    time = 1086000
+    time = 1085994
     flags = 1
     data = length 336, hash 1C585FEF
   sample 17:
-    time = 1110000
+    time = 1109994
     flags = 1
     data = length 336, hash A4A4855E
   sample 18:
-    time = 1134000
+    time = 1133994
     flags = 1
     data = length 336, hash CECA51D3
   sample 19:
-    time = 1158000
+    time = 1157994
     flags = 1
     data = length 288, hash 2D362DC5
   sample 20:
-    time = 1182000
+    time = 1181994
     flags = 1
     data = length 336, hash 9EB2609D
   sample 21:
-    time = 1206000
+    time = 1205994
     flags = 1
     data = length 336, hash 28FFB3FE
   sample 22:
-    time = 1230000
+    time = 1229994
     flags = 1
     data = length 288, hash 2AA2D216
   sample 23:
-    time = 1254000
+    time = 1253994
     flags = 1
     data = length 336, hash CDBC7032
   sample 24:
-    time = 1278000
+    time = 1277994
     flags = 1
     data = length 336, hash 25B13FE7
   sample 25:
-    time = 1302000
+    time = 1301994
     flags = 1
     data = length 336, hash DB6BB1E
   sample 26:
-    time = 1326000
+    time = 1325994
     flags = 1
     data = length 336, hash EBE951F4
   sample 27:
-    time = 1350000
+    time = 1349994
     flags = 1
     data = length 288, hash 9E2EBFF7
   sample 28:
-    time = 1374000
+    time = 1373994
     flags = 1
     data = length 336, hash 36A7D455
   sample 29:
-    time = 1398000
+    time = 1397994
     flags = 1
     data = length 336, hash 84545F8C
   sample 30:
-    time = 1422000
+    time = 1421994
     flags = 1
     data = length 336, hash F66F3045
   sample 31:
-    time = 1446000
+    time = 1445994
     flags = 1
     data = length 576, hash 5AB089EA
   sample 32:
-    time = 1470000
+    time = 1469994
     flags = 1
     data = length 336, hash 8868086
   sample 33:
-    time = 1494000
+    time = 1493994
     flags = 1
     data = length 336, hash D5EB6D63
   sample 34:
-    time = 1518000
+    time = 1517994
     flags = 1
     data = length 288, hash 7A5374B7
   sample 35:
-    time = 1542000
+    time = 1541994
     flags = 1
     data = length 336, hash BEB27A75
   sample 36:
-    time = 1566000
+    time = 1565994
     flags = 1
     data = length 336, hash E251E0FD
   sample 37:
-    time = 1590000
+    time = 1589994
     flags = 1
     data = length 288, hash D54C970
   sample 38:
-    time = 1614000
+    time = 1613994
     flags = 1
     data = length 336, hash 52C473B9
   sample 39:
-    time = 1638000
+    time = 1637994
     flags = 1
     data = length 336, hash F5F13334
   sample 40:
-    time = 1662000
+    time = 1661994
     flags = 1
     data = length 480, hash A5F1E987
   sample 41:
-    time = 1686000
+    time = 1685994
     flags = 1
     data = length 288, hash 453A1267
   sample 42:
-    time = 1710000
+    time = 1709994
     flags = 1
     data = length 288, hash 7C6C2EA9
   sample 43:
-    time = 1734000
+    time = 1733994
     flags = 1
     data = length 336, hash F4BFECA4
   sample 44:
-    time = 1758000
+    time = 1757994
     flags = 1
     data = length 336, hash 751A395A
   sample 45:
-    time = 1782000
+    time = 1781994
     flags = 1
     data = length 336, hash EE38DB02
   sample 46:
-    time = 1806000
+    time = 1805994
     flags = 1
     data = length 336, hash F18837E2
   sample 47:
-    time = 1830000
+    time = 1829994
     flags = 1
     data = length 336, hash ED36B78E
   sample 48:
-    time = 1854000
+    time = 1853994
     flags = 1
     data = length 336, hash B3D28289
   sample 49:
-    time = 1878000
+    time = 1877994
     flags = 1
     data = length 288, hash 8BDE28E1
   sample 50:
-    time = 1902000
+    time = 1901994
     flags = 1
     data = length 336, hash CFD5E966
   sample 51:
-    time = 1926000
+    time = 1925994
     flags = 1
     data = length 288, hash DC08E267
   sample 52:
-    time = 1950000
+    time = 1949994
     flags = 1
     data = length 336, hash 6530CB78
   sample 53:
-    time = 1974000
+    time = 1973994
     flags = 1
     data = length 336, hash 6CC6636E
   sample 54:
-    time = 1998000
+    time = 1997994
     flags = 1
     data = length 336, hash 613047C1
   sample 55:
-    time = 2022000
+    time = 2021994
     flags = 1
     data = length 288, hash CDC747BF
   sample 56:
-    time = 2046000
+    time = 2045994
     flags = 1
     data = length 336, hash AF22AA74
   sample 57:
-    time = 2070000
+    time = 2069994
     flags = 1
     data = length 384, hash 82F326AA
   sample 58:
-    time = 2094000
+    time = 2093994
     flags = 1
     data = length 384, hash EDA26C4D
   sample 59:
-    time = 2118000
+    time = 2117994
     flags = 1
     data = length 336, hash 94C643DC
   sample 60:
-    time = 2142000
+    time = 2141994
     flags = 1
     data = length 288, hash CB5D9C40
   sample 61:
-    time = 2166000
+    time = 2165994
     flags = 1
     data = length 336, hash 1E69DE3F
   sample 62:
-    time = 2190000
+    time = 2189994
     flags = 1
     data = length 336, hash 7E472219
   sample 63:
-    time = 2214000
+    time = 2213994
     flags = 1
     data = length 336, hash DA47B9FA
   sample 64:
-    time = 2238000
+    time = 2237994
     flags = 1
     data = length 336, hash DD0ABB7C
   sample 65:
-    time = 2262000
+    time = 2261994
     flags = 1
     data = length 288, hash DBF93FAC
   sample 66:
-    time = 2286000
+    time = 2285994
     flags = 1
     data = length 336, hash 243F4B2
   sample 67:
-    time = 2310000
+    time = 2309994
     flags = 1
     data = length 336, hash 2E881490
   sample 68:
-    time = 2334000
+    time = 2333994
     flags = 1
     data = length 288, hash 1C28C8BE
   sample 69:
-    time = 2358000
+    time = 2357994
     flags = 1
     data = length 336, hash C73E5D30
   sample 70:
-    time = 2382000
+    time = 2381994
     flags = 1
     data = length 288, hash 98B5BFF6
   sample 71:
-    time = 2406000
+    time = 2405994
     flags = 1
     data = length 336, hash E0135533
   sample 72:
-    time = 2430000
+    time = 2429994
     flags = 1
     data = length 336, hash D13C9DBC
   sample 73:
-    time = 2454000
+    time = 2453994
     flags = 1
     data = length 336, hash 63D524CA
   sample 74:
-    time = 2478000
+    time = 2477994
     flags = 1
     data = length 288, hash A28514C3
   sample 75:
-    time = 2502000
+    time = 2501994
     flags = 1
     data = length 336, hash 72B647FF
   sample 76:
-    time = 2526000
+    time = 2525994
     flags = 1
     data = length 336, hash 8F740AB1
   sample 77:
-    time = 2550000
+    time = 2549994
     flags = 1
     data = length 336, hash 5E3C7E93
   sample 78:
-    time = 2574000
+    time = 2573994
     flags = 1
     data = length 336, hash 121B913B
   sample 79:
-    time = 2598000
+    time = 2597994
     flags = 1
     data = length 336, hash 578FCCF2
   sample 80:
-    time = 2622000
+    time = 2621994
     flags = 1
     data = length 336, hash 5B5823DE
   sample 81:
-    time = 2646000
+    time = 2645994
     flags = 1
     data = length 384, hash D8B83F78
   sample 82:
-    time = 2670000
+    time = 2669994
     flags = 1
     data = length 240, hash E649682F
   sample 83:
-    time = 2694000
+    time = 2693994
     flags = 1
     data = length 96, hash C559A6F4
   sample 84:
-    time = 2718000
+    time = 2717994
     flags = 1
     data = length 96, hash 792796BC
   sample 85:
-    time = 2742000
+    time = 2741994
     flags = 1
     data = length 120, hash 8172CD0E
   sample 86:
-    time = 2766000
+    time = 2765994
     flags = 1
     data = length 120, hash F562B52F
   sample 87:
-    time = 2790000
+    time = 2789994
     flags = 1
     data = length 96, hash FF8D5B98
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.2.dump
index 8af33f6277..4fcaba8671 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.2.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=702000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=19773]]
-  getPosition(2808000) = [[timeUs=2106000, position=29613]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=701994, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=19773]]
+  getPosition(2807979) = [[timeUs=2105984, position=29613]]
 numberOfTracks = 1
 track 0:
   total output bytes = 18528
   sample count = 59
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
@@ -19,239 +19,239 @@ track 0:
     sampleRate = 48000
     metadata = entries=[TSSE: description=null: values=[Lavf58.29.100]]
   sample 0:
-    time = 1404000
+    time = 1403989
     flags = 1
     data = length 336, hash 84545F8C
   sample 1:
-    time = 1428000
+    time = 1427989
     flags = 1
     data = length 336, hash F66F3045
   sample 2:
-    time = 1452000
+    time = 1451989
     flags = 1
     data = length 576, hash 5AB089EA
   sample 3:
-    time = 1476000
+    time = 1475989
     flags = 1
     data = length 336, hash 8868086
   sample 4:
-    time = 1500000
+    time = 1499989
     flags = 1
     data = length 336, hash D5EB6D63
   sample 5:
-    time = 1524000
+    time = 1523989
     flags = 1
     data = length 288, hash 7A5374B7
   sample 6:
-    time = 1548000
+    time = 1547989
     flags = 1
     data = length 336, hash BEB27A75
   sample 7:
-    time = 1572000
+    time = 1571989
     flags = 1
     data = length 336, hash E251E0FD
   sample 8:
-    time = 1596000
+    time = 1595989
     flags = 1
     data = length 288, hash D54C970
   sample 9:
-    time = 1620000
+    time = 1619989
     flags = 1
     data = length 336, hash 52C473B9
   sample 10:
-    time = 1644000
+    time = 1643989
     flags = 1
     data = length 336, hash F5F13334
   sample 11:
-    time = 1668000
+    time = 1667989
     flags = 1
     data = length 480, hash A5F1E987
   sample 12:
-    time = 1692000
+    time = 1691989
     flags = 1
     data = length 288, hash 453A1267
   sample 13:
-    time = 1716000
+    time = 1715989
     flags = 1
     data = length 288, hash 7C6C2EA9
   sample 14:
-    time = 1740000
+    time = 1739989
     flags = 1
     data = length 336, hash F4BFECA4
   sample 15:
-    time = 1764000
+    time = 1763989
     flags = 1
     data = length 336, hash 751A395A
   sample 16:
-    time = 1788000
+    time = 1787989
     flags = 1
     data = length 336, hash EE38DB02
   sample 17:
-    time = 1812000
+    time = 1811989
     flags = 1
     data = length 336, hash F18837E2
   sample 18:
-    time = 1836000
+    time = 1835989
     flags = 1
     data = length 336, hash ED36B78E
   sample 19:
-    time = 1860000
+    time = 1859989
     flags = 1
     data = length 336, hash B3D28289
   sample 20:
-    time = 1884000
+    time = 1883989
     flags = 1
     data = length 288, hash 8BDE28E1
   sample 21:
-    time = 1908000
+    time = 1907989
     flags = 1
     data = length 336, hash CFD5E966
   sample 22:
-    time = 1932000
+    time = 1931989
     flags = 1
     data = length 288, hash DC08E267
   sample 23:
-    time = 1956000
+    time = 1955989
     flags = 1
     data = length 336, hash 6530CB78
   sample 24:
-    time = 1980000
+    time = 1979989
     flags = 1
     data = length 336, hash 6CC6636E
   sample 25:
-    time = 2004000
+    time = 2003989
     flags = 1
     data = length 336, hash 613047C1
   sample 26:
-    time = 2028000
+    time = 2027989
     flags = 1
     data = length 288, hash CDC747BF
   sample 27:
-    time = 2052000
+    time = 2051989
     flags = 1
     data = length 336, hash AF22AA74
   sample 28:
-    time = 2076000
+    time = 2075989
     flags = 1
     data = length 384, hash 82F326AA
   sample 29:
-    time = 2100000
+    time = 2099989
     flags = 1
     data = length 384, hash EDA26C4D
   sample 30:
-    time = 2124000
+    time = 2123989
     flags = 1
     data = length 336, hash 94C643DC
   sample 31:
-    time = 2148000
+    time = 2147989
     flags = 1
     data = length 288, hash CB5D9C40
   sample 32:
-    time = 2172000
+    time = 2171989
     flags = 1
     data = length 336, hash 1E69DE3F
   sample 33:
-    time = 2196000
+    time = 2195989
     flags = 1
     data = length 336, hash 7E472219
   sample 34:
-    time = 2220000
+    time = 2219989
     flags = 1
     data = length 336, hash DA47B9FA
   sample 35:
-    time = 2244000
+    time = 2243989
     flags = 1
     data = length 336, hash DD0ABB7C
   sample 36:
-    time = 2268000
+    time = 2267989
     flags = 1
     data = length 288, hash DBF93FAC
   sample 37:
-    time = 2292000
+    time = 2291989
     flags = 1
     data = length 336, hash 243F4B2
   sample 38:
-    time = 2316000
+    time = 2315989
     flags = 1
     data = length 336, hash 2E881490
   sample 39:
-    time = 2340000
+    time = 2339989
     flags = 1
     data = length 288, hash 1C28C8BE
   sample 40:
-    time = 2364000
+    time = 2363989
     flags = 1
     data = length 336, hash C73E5D30
   sample 41:
-    time = 2388000
+    time = 2387989
     flags = 1
     data = length 288, hash 98B5BFF6
   sample 42:
-    time = 2412000
+    time = 2411989
     flags = 1
     data = length 336, hash E0135533
   sample 43:
-    time = 2436000
+    time = 2435989
     flags = 1
     data = length 336, hash D13C9DBC
   sample 44:
-    time = 2460000
+    time = 2459989
     flags = 1
     data = length 336, hash 63D524CA
   sample 45:
-    time = 2484000
+    time = 2483989
     flags = 1
     data = length 288, hash A28514C3
   sample 46:
-    time = 2508000
+    time = 2507989
     flags = 1
     data = length 336, hash 72B647FF
   sample 47:
-    time = 2532000
+    time = 2531989
     flags = 1
     data = length 336, hash 8F740AB1
   sample 48:
-    time = 2556000
+    time = 2555989
     flags = 1
     data = length 336, hash 5E3C7E93
   sample 49:
-    time = 2580000
+    time = 2579989
     flags = 1
     data = length 336, hash 121B913B
   sample 50:
-    time = 2604000
+    time = 2603989
     flags = 1
     data = length 336, hash 578FCCF2
   sample 51:
-    time = 2628000
+    time = 2627989
     flags = 1
     data = length 336, hash 5B5823DE
   sample 52:
-    time = 2652000
+    time = 2651989
     flags = 1
     data = length 384, hash D8B83F78
   sample 53:
-    time = 2676000
+    time = 2675989
     flags = 1
     data = length 240, hash E649682F
   sample 54:
-    time = 2700000
+    time = 2699989
     flags = 1
     data = length 96, hash C559A6F4
   sample 55:
-    time = 2724000
+    time = 2723989
     flags = 1
     data = length 96, hash 792796BC
   sample 56:
-    time = 2748000
+    time = 2747989
     flags = 1
     data = length 120, hash 8172CD0E
   sample 57:
-    time = 2772000
+    time = 2771989
     flags = 1
     data = length 120, hash F562B52F
   sample 58:
-    time = 2796000
+    time = 2795989
     flags = 1
     data = length 96, hash FF8D5B98
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.3.dump
index 7db568497e..272241c590 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.3.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=702000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=19773]]
-  getPosition(2808000) = [[timeUs=2106000, position=29613]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=701994, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=19773]]
+  getPosition(2807979) = [[timeUs=2105984, position=29613]]
 numberOfTracks = 1
 track 0:
   total output bytes = 8688
   sample count = 30
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg
@@ -19,123 +19,123 @@ track 0:
     sampleRate = 48000
     metadata = entries=[TSSE: description=null: values=[Lavf58.29.100]]
   sample 0:
-    time = 2106000
+    time = 2105984
     flags = 1
     data = length 384, hash EDA26C4D
   sample 1:
-    time = 2130000
+    time = 2129984
     flags = 1
     data = length 336, hash 94C643DC
   sample 2:
-    time = 2154000
+    time = 2153984
     flags = 1
     data = length 288, hash CB5D9C40
   sample 3:
-    time = 2178000
+    time = 2177984
     flags = 1
     data = length 336, hash 1E69DE3F
   sample 4:
-    time = 2202000
+    time = 2201984
     flags = 1
     data = length 336, hash 7E472219
   sample 5:
-    time = 2226000
+    time = 2225984
     flags = 1
     data = length 336, hash DA47B9FA
   sample 6:
-    time = 2250000
+    time = 2249984
     flags = 1
     data = length 336, hash DD0ABB7C
   sample 7:
-    time = 2274000
+    time = 2273984
     flags = 1
     data = length 288, hash DBF93FAC
   sample 8:
-    time = 2298000
+    time = 2297984
     flags = 1
     data = length 336, hash 243F4B2
   sample 9:
-    time = 2322000
+    time = 2321984
     flags = 1
     data = length 336, hash 2E881490
   sample 10:
-    time = 2346000
+    time = 2345984
     flags = 1
     data = length 288, hash 1C28C8BE
   sample 11:
-    time = 2370000
+    time = 2369984
     flags = 1
     data = length 336, hash C73E5D30
   sample 12:
-    time = 2394000
+    time = 2393984
     flags = 1
     data = length 288, hash 98B5BFF6
   sample 13:
-    time = 2418000
+    time = 2417984
     flags = 1
     data = length 336, hash E0135533
   sample 14:
-    time = 2442000
+    time = 2441984
     flags = 1
     data = length 336, hash D13C9DBC
   sample 15:
-    time = 2466000
+    time = 2465984
     flags = 1
     data = length 336, hash 63D524CA
   sample 16:
-    time = 2490000
+    time = 2489984
     flags = 1
     data = length 288, hash A28514C3
   sample 17:
-    time = 2514000
+    time = 2513984
     flags = 1
     data = length 336, hash 72B647FF
   sample 18:
-    time = 2538000
+    time = 2537984
     flags = 1
     data = length 336, hash 8F740AB1
   sample 19:
-    time = 2562000
+    time = 2561984
     flags = 1
     data = length 336, hash 5E3C7E93
   sample 20:
-    time = 2586000
+    time = 2585984
     flags = 1
     data = length 336, hash 121B913B
   sample 21:
-    time = 2610000
+    time = 2609984
     flags = 1
     data = length 336, hash 578FCCF2
   sample 22:
-    time = 2634000
+    time = 2633984
     flags = 1
     data = length 336, hash 5B5823DE
   sample 23:
-    time = 2658000
+    time = 2657984
     flags = 1
     data = length 384, hash D8B83F78
   sample 24:
-    time = 2682000
+    time = 2681984
     flags = 1
     data = length 240, hash E649682F
   sample 25:
-    time = 2706000
+    time = 2705984
     flags = 1
     data = length 96, hash C559A6F4
   sample 26:
-    time = 2730000
+    time = 2729984
     flags = 1
     data = length 96, hash 792796BC
   sample 27:
-    time = 2754000
+    time = 2753984
     flags = 1
     data = length 120, hash 8172CD0E
   sample 28:
-    time = 2778000
+    time = 2777984
     flags = 1
     data = length 120, hash F562B52F
   sample 29:
-    time = 2802000
+    time = 2801984
     flags = 1
     data = length 96, hash FF8D5B98
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.unknown_length.dump
index dad37edeef..9bbdfa0402 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-vbri-header.mp3.unknown_length.dump
@@ -1,15 +1,15 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
+  duration = 2807979
   getPosition(0) = [[timeUs=0, position=141]]
-  getPosition(1) = [[timeUs=0, position=141], [timeUs=702000, position=10413]]
-  getPosition(1404000) = [[timeUs=1404000, position=19773]]
-  getPosition(2808000) = [[timeUs=2106000, position=29613]]
+  getPosition(1) = [[timeUs=0, position=141], [timeUs=701994, position=10413]]
+  getPosition(1403989) = [[timeUs=1403989, position=19773]]
+  getPosition(2807979) = [[timeUs=2105984, position=29613]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
-  track duration = 2808000
+  track duration = 2807979
   format 0:
     averageBitrate = 32000
     containerMimeType = audio/mpeg