diff --git a/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3 b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3
new file mode 100644
index 0000000000..010fc3776f
Binary files /dev/null and b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3 differ
diff --git a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.0.dump b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump
similarity index 56%
rename from library/extractor/src/test/assets/mp3/bear-xing-header.mp3.0.dump
rename to library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump
index e597f0a721..5225210979 100644
--- a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.0.dump
+++ b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump
@@ -1,7 +1,7 @@
 seekMap:
   isSeekable = true
-  duration = 2784000
-  getPosition(0) = [[timeUs=0, position=201]]
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=224]]
 numberOfTracks = 1
 track 0:
   format:
@@ -18,478 +18,482 @@ track 0:
     channelCount = 2
     sampleRate = 48000
     pcmEncoding = -1
-    encoderDelay = 956
-    encoderPadding = 3352
+    encoderDelay = 0
+    encoderPadding = 0
     subsampleOffsetUs = 9223372036854775807
     selectionFlags = 0
     language = null
     drmInitData = -
-    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
+    metadata = null
     initializationData:
-  total output bytes = 44544
-  sample count = 116
+  total output bytes = 38160
+  sample count = 117
   sample 0:
     time = 0
     flags = 1
-    data = length 384, hash B1FBF8BD
+    data = length 96, hash 1F161542
   sample 1:
     time = 24000
     flags = 1
-    data = length 384, hash 2B9A3B72
+    data = length 768, hash CD1DC50F
   sample 2:
     time = 48000
     flags = 1
-    data = length 384, hash 33C65BA6
+    data = length 336, hash 3F64124B
   sample 3:
     time = 72000
     flags = 1
-    data = length 384, hash E64FE475
+    data = length 336, hash 8FFED94E
   sample 4:
     time = 96000
     flags = 1
-    data = length 384, hash E9122D34
+    data = length 288, hash 9CD77D47
   sample 5:
     time = 120000
     flags = 1
-    data = length 384, hash 9CC87327
+    data = length 384, hash 24607BB5
   sample 6:
     time = 144000
     flags = 1
-    data = length 384, hash 118CF6DA
+    data = length 480, hash 4937EBAB
   sample 7:
     time = 168000
     flags = 1
-    data = length 384, hash 9610D9D6
+    data = length 336, hash 546342B1
   sample 8:
     time = 192000
     flags = 1
-    data = length 384, hash 6ABFE405
+    data = length 336, hash 79E0923F
   sample 9:
     time = 216000
     flags = 1
-    data = length 384, hash EE5C93A9
+    data = length 336, hash AB1F3948
   sample 10:
     time = 240000
     flags = 1
-    data = length 384, hash 44E0D140
+    data = length 336, hash C3A4D888
   sample 11:
     time = 264000
     flags = 1
-    data = length 384, hash 3B3DE1D6
+    data = length 288, hash 7867DA45
   sample 12:
     time = 288000
     flags = 1
-    data = length 384, hash 3A572E7C
+    data = length 336, hash B1240B73
   sample 13:
     time = 312000
     flags = 1
-    data = length 384, hash 240316E1
+    data = length 336, hash 94CFCD35
   sample 14:
     time = 336000
     flags = 1
-    data = length 384, hash 9EDA9AA0
+    data = length 288, hash 94F412C
   sample 15:
     time = 360000
     flags = 1
-    data = length 384, hash E31AB44F
+    data = length 336, hash A1D9FF41
   sample 16:
     time = 384000
     flags = 1
-    data = length 384, hash A12497D6
+    data = length 288, hash 2A8DA21B
   sample 17:
     time = 408000
     flags = 1
-    data = length 384, hash 8A179B75
+    data = length 336, hash 6A429CE
   sample 18:
     time = 432000
     flags = 1
-    data = length 384, hash FCE9E107
+    data = length 336, hash 68853982
   sample 19:
     time = 456000
     flags = 1
-    data = length 384, hash 52CA9665
+    data = length 384, hash 1D6F779C
   sample 20:
     time = 480000
     flags = 1
-    data = length 384, hash 9935EC4C
+    data = length 480, hash 6B31EBEE
   sample 21:
     time = 504000
     flags = 1
-    data = length 384, hash 33CA710A
+    data = length 336, hash 888335BE
   sample 22:
     time = 528000
     flags = 1
-    data = length 384, hash 45B5D69
+    data = length 336, hash 6072AC8B
   sample 23:
     time = 552000
     flags = 1
-    data = length 384, hash 7CEC655D
+    data = length 336, hash C9D24234
   sample 24:
     time = 576000
     flags = 1
-    data = length 384, hash 3B5D8310
+    data = length 288, hash 52BF4D1E
   sample 25:
     time = 600000
     flags = 1
-    data = length 384, hash 3EB640F8
+    data = length 336, hash F93F4F0
   sample 26:
     time = 624000
     flags = 1
-    data = length 384, hash FAEC53B4
+    data = length 336, hash 8617688A
   sample 27:
     time = 648000
     flags = 1
-    data = length 384, hash 92C8A6EE
+    data = length 480, hash FAB0D31B
   sample 28:
     time = 672000
     flags = 1
-    data = length 384, hash 7CBAAE91
+    data = length 384, hash FA4B53E2
   sample 29:
     time = 696000
     flags = 1
-    data = length 384, hash 74AC754E
+    data = length 336, hash 8C435F6A
   sample 30:
     time = 720000
     flags = 1
-    data = length 384, hash 8242C434
+    data = length 336, hash 60D3F80C
   sample 31:
     time = 744000
     flags = 1
-    data = length 384, hash 686C06FB
+    data = length 336, hash DC15B68B
   sample 32:
     time = 768000
     flags = 1
-    data = length 384, hash 1D872A3F
+    data = length 288, hash FF3DF141
   sample 33:
     time = 792000
     flags = 1
-    data = length 384, hash 900A20BC
+    data = length 336, hash A64B3042
   sample 34:
     time = 816000
     flags = 1
-    data = length 384, hash B72FD8E7
+    data = length 336, hash ACA622A1
   sample 35:
     time = 840000
     flags = 1
-    data = length 384, hash 85C9A1FB
+    data = length 288, hash 3E34B8D4
   sample 36:
     time = 864000
     flags = 1
-    data = length 384, hash 1600DF3
+    data = length 288, hash 9B96F72A
   sample 37:
     time = 888000
     flags = 1
-    data = length 384, hash D6C2138A
+    data = length 336, hash E917C122
   sample 38:
     time = 912000
     flags = 1
-    data = length 384, hash 737BA69E
+    data = length 336, hash 10ED1470
   sample 39:
     time = 936000
     flags = 1
-    data = length 384, hash F7E344F4
+    data = length 288, hash 706B8A7C
   sample 40:
     time = 960000
     flags = 1
-    data = length 384, hash 14EF6AFD
+    data = length 336, hash 71FFE4A0
   sample 41:
     time = 984000
     flags = 1
-    data = length 384, hash 61C9B92C
+    data = length 336, hash D4160463
   sample 42:
     time = 1008000
     flags = 1
-    data = length 384, hash ABE1368
+    data = length 336, hash EC557B14
   sample 43:
     time = 1032000
     flags = 1
-    data = length 384, hash 6A3B8547
+    data = length 288, hash 5598CF8B
   sample 44:
     time = 1056000
     flags = 1
-    data = length 384, hash 30E905FA
+    data = length 336, hash 7E0AB41
   sample 45:
     time = 1080000
     flags = 1
-    data = length 384, hash 21A267CD
+    data = length 336, hash 1C585FEF
   sample 46:
     time = 1104000
     flags = 1
-    data = length 384, hash D96A2651
+    data = length 336, hash A4A4855E
   sample 47:
     time = 1128000
     flags = 1
-    data = length 384, hash 72340177
+    data = length 336, hash CECA51D3
   sample 48:
     time = 1152000
     flags = 1
-    data = length 384, hash 9345E744
+    data = length 288, hash 2D362DC5
   sample 49:
     time = 1176000
     flags = 1
-    data = length 384, hash FDE39E3A
+    data = length 336, hash 9EB2609D
   sample 50:
     time = 1200000
     flags = 1
-    data = length 384, hash F0B7465
+    data = length 336, hash 28FFB3FE
   sample 51:
     time = 1224000
     flags = 1
-    data = length 384, hash 3693AB86
+    data = length 288, hash 2AA2D216
   sample 52:
     time = 1248000
     flags = 1
-    data = length 384, hash F39719B1
+    data = length 336, hash CDBC7032
   sample 53:
     time = 1272000
     flags = 1
-    data = length 384, hash DA3958DC
+    data = length 336, hash 25B13FE7
   sample 54:
     time = 1296000
     flags = 1
-    data = length 384, hash FDC7599F
+    data = length 336, hash DB6BB1E
   sample 55:
     time = 1320000
     flags = 1
-    data = length 384, hash AEFF8471
+    data = length 336, hash EBE951F4
   sample 56:
     time = 1344000
     flags = 1
-    data = length 384, hash 89C92C19
+    data = length 288, hash 9E2EBFF7
   sample 57:
     time = 1368000
     flags = 1
-    data = length 384, hash 5C786A4B
+    data = length 336, hash 36A7D455
   sample 58:
     time = 1392000
     flags = 1
-    data = length 384, hash 5ACA8B
+    data = length 336, hash 84545F8C
   sample 59:
     time = 1416000
     flags = 1
-    data = length 384, hash 7755974C
+    data = length 336, hash F66F3045
   sample 60:
     time = 1440000
     flags = 1
-    data = length 384, hash 3934B73C
+    data = length 576, hash 5AB089EA
   sample 61:
     time = 1464000
     flags = 1
-    data = length 384, hash DDD70A2F
+    data = length 336, hash 8868086
   sample 62:
     time = 1488000
     flags = 1
-    data = length 384, hash 8FACE2EF
+    data = length 336, hash D5EB6D63
   sample 63:
     time = 1512000
     flags = 1
-    data = length 384, hash 4A602591
+    data = length 288, hash 7A5374B7
   sample 64:
     time = 1536000
     flags = 1
-    data = length 384, hash D019AA2D
+    data = length 336, hash BEB27A75
   sample 65:
     time = 1560000
     flags = 1
-    data = length 384, hash 8A680B9D
+    data = length 336, hash E251E0FD
   sample 66:
     time = 1584000
     flags = 1
-    data = length 384, hash B655C959
+    data = length 288, hash D54C970
   sample 67:
     time = 1608000
     flags = 1
-    data = length 384, hash 2168336B
+    data = length 336, hash 52C473B9
   sample 68:
     time = 1632000
     flags = 1
-    data = length 384, hash D77F6D31
+    data = length 336, hash F5F13334
   sample 69:
     time = 1656000
     flags = 1
-    data = length 384, hash 524B4B2F
+    data = length 480, hash A5F1E987
   sample 70:
     time = 1680000
     flags = 1
-    data = length 384, hash 4752DDFC
+    data = length 288, hash 453A1267
   sample 71:
     time = 1704000
     flags = 1
-    data = length 384, hash E786727F
+    data = length 288, hash 7C6C2EA9
   sample 72:
     time = 1728000
     flags = 1
-    data = length 384, hash 5DA6FB8C
+    data = length 336, hash F4BFECA4
   sample 73:
     time = 1752000
     flags = 1
-    data = length 384, hash 92F24269
+    data = length 336, hash 751A395A
   sample 74:
     time = 1776000
     flags = 1
-    data = length 384, hash CD0A3BA1
+    data = length 336, hash EE38DB02
   sample 75:
     time = 1800000
     flags = 1
-    data = length 384, hash 7D00409F
+    data = length 336, hash F18837E2
   sample 76:
     time = 1824000
     flags = 1
-    data = length 384, hash D7ADB5FA
+    data = length 336, hash ED36B78E
   sample 77:
     time = 1848000
     flags = 1
-    data = length 384, hash 4A140209
+    data = length 336, hash B3D28289
   sample 78:
     time = 1872000
     flags = 1
-    data = length 384, hash E801184A
+    data = length 288, hash 8BDE28E1
   sample 79:
     time = 1896000
     flags = 1
-    data = length 384, hash 53C6CF9C
+    data = length 336, hash CFD5E966
   sample 80:
     time = 1920000
     flags = 1
-    data = length 384, hash 19A8D99F
+    data = length 288, hash DC08E267
   sample 81:
     time = 1944000
     flags = 1
-    data = length 384, hash E47EB43F
+    data = length 336, hash 6530CB78
   sample 82:
     time = 1968000
     flags = 1
-    data = length 384, hash 4EA329E7
+    data = length 336, hash 6CC6636E
   sample 83:
     time = 1992000
     flags = 1
-    data = length 384, hash 1CCAAE62
+    data = length 336, hash 613047C1
   sample 84:
     time = 2016000
     flags = 1
-    data = length 384, hash ED3F8C66
+    data = length 288, hash CDC747BF
   sample 85:
     time = 2040000
     flags = 1
-    data = length 384, hash D3D646B6
+    data = length 336, hash AF22AA74
   sample 86:
     time = 2064000
     flags = 1
-    data = length 384, hash 68CD1574
+    data = length 384, hash 82F326AA
   sample 87:
     time = 2088000
     flags = 1
-    data = length 384, hash 8CEAB382
+    data = length 384, hash EDA26C4D
   sample 88:
     time = 2112000
     flags = 1
-    data = length 384, hash D54B1C48
+    data = length 336, hash 94C643DC
   sample 89:
     time = 2136000
     flags = 1
-    data = length 384, hash FFE2EE90
+    data = length 288, hash CB5D9C40
   sample 90:
     time = 2160000
     flags = 1
-    data = length 384, hash BFE8A673
+    data = length 336, hash 1E69DE3F
   sample 91:
     time = 2184000
     flags = 1
-    data = length 384, hash 978B1C92
+    data = length 336, hash 7E472219
   sample 92:
     time = 2208000
     flags = 1
-    data = length 384, hash 810CC71E
+    data = length 336, hash DA47B9FA
   sample 93:
     time = 2232000
     flags = 1
-    data = length 384, hash 44FE42D9
+    data = length 336, hash DD0ABB7C
   sample 94:
     time = 2256000
     flags = 1
-    data = length 384, hash 2F5BB02C
+    data = length 288, hash DBF93FAC
   sample 95:
     time = 2280000
     flags = 1
-    data = length 384, hash 77DDB90
+    data = length 336, hash 243F4B2
   sample 96:
     time = 2304000
     flags = 1
-    data = length 384, hash 24FB5EDA
+    data = length 336, hash 2E881490
   sample 97:
     time = 2328000
     flags = 1
-    data = length 384, hash E73203C6
+    data = length 288, hash 1C28C8BE
   sample 98:
     time = 2352000
     flags = 1
-    data = length 384, hash 14B525F1
+    data = length 336, hash C73E5D30
   sample 99:
     time = 2376000
     flags = 1
-    data = length 384, hash 5E0F4E2E
+    data = length 288, hash 98B5BFF6
   sample 100:
     time = 2400000
     flags = 1
-    data = length 384, hash 67EE4E31
+    data = length 336, hash E0135533
   sample 101:
     time = 2424000
     flags = 1
-    data = length 384, hash 2E04EC4C
+    data = length 336, hash D13C9DBC
   sample 102:
     time = 2448000
     flags = 1
-    data = length 384, hash 852CABA7
+    data = length 336, hash 63D524CA
   sample 103:
     time = 2472000
     flags = 1
-    data = length 384, hash 19928903
+    data = length 288, hash A28514C3
   sample 104:
     time = 2496000
     flags = 1
-    data = length 384, hash 5DA42021
+    data = length 336, hash 72B647FF
   sample 105:
     time = 2520000
     flags = 1
-    data = length 384, hash 45B20B7C
+    data = length 336, hash 8F740AB1
   sample 106:
     time = 2544000
     flags = 1
-    data = length 384, hash D108A215
+    data = length 336, hash 5E3C7E93
   sample 107:
     time = 2568000
     flags = 1
-    data = length 384, hash BD25DB7C
+    data = length 336, hash 121B913B
   sample 108:
     time = 2592000
     flags = 1
-    data = length 384, hash DA7F9861
+    data = length 336, hash 578FCCF2
   sample 109:
     time = 2616000
     flags = 1
-    data = length 384, hash CCD576F
+    data = length 336, hash 5B5823DE
   sample 110:
     time = 2640000
     flags = 1
-    data = length 384, hash 405C1EB5
+    data = length 384, hash D8B83F78
   sample 111:
     time = 2664000
     flags = 1
-    data = length 384, hash 6640B74E
+    data = length 240, hash E649682F
   sample 112:
     time = 2688000
     flags = 1
-    data = length 384, hash B4E5937A
+    data = length 96, hash C559A6F4
   sample 113:
     time = 2712000
     flags = 1
-    data = length 384, hash CEE17733
+    data = length 96, hash 792796BC
   sample 114:
     time = 2736000
     flags = 1
-    data = length 384, hash 2A0DA733
+    data = length 120, hash 8172CD0E
   sample 115:
     time = 2760000
     flags = 1
-    data = length 384, hash 97F4129B
+    data = length 120, hash F562B52F
+  sample 116:
+    time = 2784000
+    flags = 1
+    data = length 96, hash FF8D5B98
 tracksEnded = true
diff --git a/library/extractor/src/test/assets/mp3/bear-vbr.mp3.1.dump b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump
similarity index 97%
rename from library/extractor/src/test/assets/mp3/bear-vbr.mp3.1.dump
rename to library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump
index dabe8be921..ebdbb9cdb0 100644
--- a/library/extractor/src/test/assets/mp3/bear-vbr.mp3.1.dump
+++ b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump
@@ -1,7 +1,7 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
-  getPosition(0) = [[timeUs=0, position=237]]
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=224]]
 numberOfTracks = 1
 track 0:
   format:
@@ -18,13 +18,13 @@ track 0:
     channelCount = 2
     sampleRate = 48000
     pcmEncoding = -1
-    encoderDelay = 576
-    encoderPadding = 576
+    encoderDelay = 0
+    encoderPadding = 0
     subsampleOffsetUs = 9223372036854775807
     selectionFlags = 0
     language = null
     drmInitData = -
-    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
+    metadata = null
     initializationData:
   total output bytes = 25920
   sample count = 82
diff --git a/library/extractor/src/test/assets/mp3/bear-vbr.mp3.2.dump b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump
similarity index 95%
rename from library/extractor/src/test/assets/mp3/bear-vbr.mp3.2.dump
rename to library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump
index 2d5af88b15..d505251f61 100644
--- a/library/extractor/src/test/assets/mp3/bear-vbr.mp3.2.dump
+++ b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump
@@ -1,7 +1,7 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
-  getPosition(0) = [[timeUs=0, position=237]]
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=224]]
 numberOfTracks = 1
 track 0:
   format:
@@ -18,13 +18,13 @@ track 0:
     channelCount = 2
     sampleRate = 48000
     pcmEncoding = -1
-    encoderDelay = 576
-    encoderPadding = 576
+    encoderDelay = 0
+    encoderPadding = 0
     subsampleOffsetUs = 9223372036854775807
     selectionFlags = 0
     language = null
     drmInitData = -
-    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
+    metadata = null
     initializationData:
   total output bytes = 12624
   sample count = 42
diff --git a/library/extractor/src/test/assets/mp3/bear-vbr.mp3.3.dump b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump
similarity index 79%
rename from library/extractor/src/test/assets/mp3/bear-vbr.mp3.3.dump
rename to library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump
index 1dc7fa9258..1341231b6a 100644
--- a/library/extractor/src/test/assets/mp3/bear-vbr.mp3.3.dump
+++ b/library/extractor/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump
@@ -1,7 +1,7 @@
 seekMap:
   isSeekable = true
-  duration = 2808000
-  getPosition(0) = [[timeUs=0, position=237]]
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=224]]
 numberOfTracks = 1
 track 0:
   format:
@@ -18,13 +18,13 @@ track 0:
     channelCount = 2
     sampleRate = 48000
     pcmEncoding = -1
-    encoderDelay = 576
-    encoderPadding = 576
+    encoderDelay = 0
+    encoderPadding = 0
     subsampleOffsetUs = 9223372036854775807
     selectionFlags = 0
     language = null
     drmInitData = -
-    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
+    metadata = null
     initializationData:
   total output bytes = 216
   sample count = 2
diff --git a/library/extractor/src/test/assets/mp3/bear-vbr.mp3 b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3
similarity index 100%
rename from library/extractor/src/test/assets/mp3/bear-vbr.mp3
rename to library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3
diff --git a/library/extractor/src/test/assets/mp3/bear-vbr.mp3.0.dump b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/bear-vbr.mp3.0.dump
rename to library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.0.dump
diff --git a/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump
new file mode 100644
index 0000000000..7ecdb77281
--- /dev/null
+++ b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump
@@ -0,0 +1,339 @@
+seekMap:
+  isSeekable = true
+  duration = 2808000
+  getPosition(0) = [[timeUs=0, position=237]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = null
+    containerMimeType = null
+    sampleMimeType = audio/mpeg
+    maxInputSize = 4096
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 576
+    encoderPadding = 576
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
+    initializationData:
+  total output bytes = 24384
+  sample count = 77
+  sample 0:
+    time = 958041
+    flags = 1
+    data = length 336, hash 71FFE4A0
+  sample 1:
+    time = 982041
+    flags = 1
+    data = length 336, hash D4160463
+  sample 2:
+    time = 1006041
+    flags = 1
+    data = length 336, hash EC557B14
+  sample 3:
+    time = 1030041
+    flags = 1
+    data = length 288, hash 5598CF8B
+  sample 4:
+    time = 1054041
+    flags = 1
+    data = length 336, hash 7E0AB41
+  sample 5:
+    time = 1078041
+    flags = 1
+    data = length 336, hash 1C585FEF
+  sample 6:
+    time = 1102041
+    flags = 1
+    data = length 336, hash A4A4855E
+  sample 7:
+    time = 1126041
+    flags = 1
+    data = length 336, hash CECA51D3
+  sample 8:
+    time = 1150041
+    flags = 1
+    data = length 288, hash 2D362DC5
+  sample 9:
+    time = 1174041
+    flags = 1
+    data = length 336, hash 9EB2609D
+  sample 10:
+    time = 1198041
+    flags = 1
+    data = length 336, hash 28FFB3FE
+  sample 11:
+    time = 1222041
+    flags = 1
+    data = length 288, hash 2AA2D216
+  sample 12:
+    time = 1246041
+    flags = 1
+    data = length 336, hash CDBC7032
+  sample 13:
+    time = 1270041
+    flags = 1
+    data = length 336, hash 25B13FE7
+  sample 14:
+    time = 1294041
+    flags = 1
+    data = length 336, hash DB6BB1E
+  sample 15:
+    time = 1318041
+    flags = 1
+    data = length 336, hash EBE951F4
+  sample 16:
+    time = 1342041
+    flags = 1
+    data = length 288, hash 9E2EBFF7
+  sample 17:
+    time = 1366041
+    flags = 1
+    data = length 336, hash 36A7D455
+  sample 18:
+    time = 1390041
+    flags = 1
+    data = length 336, hash 84545F8C
+  sample 19:
+    time = 1414041
+    flags = 1
+    data = length 336, hash F66F3045
+  sample 20:
+    time = 1438041
+    flags = 1
+    data = length 576, hash 5AB089EA
+  sample 21:
+    time = 1462041
+    flags = 1
+    data = length 336, hash 8868086
+  sample 22:
+    time = 1486041
+    flags = 1
+    data = length 336, hash D5EB6D63
+  sample 23:
+    time = 1510041
+    flags = 1
+    data = length 288, hash 7A5374B7
+  sample 24:
+    time = 1534041
+    flags = 1
+    data = length 336, hash BEB27A75
+  sample 25:
+    time = 1558041
+    flags = 1
+    data = length 336, hash E251E0FD
+  sample 26:
+    time = 1582041
+    flags = 1
+    data = length 288, hash D54C970
+  sample 27:
+    time = 1606041
+    flags = 1
+    data = length 336, hash 52C473B9
+  sample 28:
+    time = 1630041
+    flags = 1
+    data = length 336, hash F5F13334
+  sample 29:
+    time = 1654041
+    flags = 1
+    data = length 480, hash A5F1E987
+  sample 30:
+    time = 1678041
+    flags = 1
+    data = length 288, hash 453A1267
+  sample 31:
+    time = 1702041
+    flags = 1
+    data = length 288, hash 7C6C2EA9
+  sample 32:
+    time = 1726041
+    flags = 1
+    data = length 336, hash F4BFECA4
+  sample 33:
+    time = 1750041
+    flags = 1
+    data = length 336, hash 751A395A
+  sample 34:
+    time = 1774041
+    flags = 1
+    data = length 336, hash EE38DB02
+  sample 35:
+    time = 1798041
+    flags = 1
+    data = length 336, hash F18837E2
+  sample 36:
+    time = 1822041
+    flags = 1
+    data = length 336, hash ED36B78E
+  sample 37:
+    time = 1846041
+    flags = 1
+    data = length 336, hash B3D28289
+  sample 38:
+    time = 1870041
+    flags = 1
+    data = length 288, hash 8BDE28E1
+  sample 39:
+    time = 1894041
+    flags = 1
+    data = length 336, hash CFD5E966
+  sample 40:
+    time = 1918041
+    flags = 1
+    data = length 288, hash DC08E267
+  sample 41:
+    time = 1942041
+    flags = 1
+    data = length 336, hash 6530CB78
+  sample 42:
+    time = 1966041
+    flags = 1
+    data = length 336, hash 6CC6636E
+  sample 43:
+    time = 1990041
+    flags = 1
+    data = length 336, hash 613047C1
+  sample 44:
+    time = 2014041
+    flags = 1
+    data = length 288, hash CDC747BF
+  sample 45:
+    time = 2038041
+    flags = 1
+    data = length 336, hash AF22AA74
+  sample 46:
+    time = 2062041
+    flags = 1
+    data = length 384, hash 82F326AA
+  sample 47:
+    time = 2086041
+    flags = 1
+    data = length 384, hash EDA26C4D
+  sample 48:
+    time = 2110041
+    flags = 1
+    data = length 336, hash 94C643DC
+  sample 49:
+    time = 2134041
+    flags = 1
+    data = length 288, hash CB5D9C40
+  sample 50:
+    time = 2158041
+    flags = 1
+    data = length 336, hash 1E69DE3F
+  sample 51:
+    time = 2182041
+    flags = 1
+    data = length 336, hash 7E472219
+  sample 52:
+    time = 2206041
+    flags = 1
+    data = length 336, hash DA47B9FA
+  sample 53:
+    time = 2230041
+    flags = 1
+    data = length 336, hash DD0ABB7C
+  sample 54:
+    time = 2254041
+    flags = 1
+    data = length 288, hash DBF93FAC
+  sample 55:
+    time = 2278041
+    flags = 1
+    data = length 336, hash 243F4B2
+  sample 56:
+    time = 2302041
+    flags = 1
+    data = length 336, hash 2E881490
+  sample 57:
+    time = 2326041
+    flags = 1
+    data = length 288, hash 1C28C8BE
+  sample 58:
+    time = 2350041
+    flags = 1
+    data = length 336, hash C73E5D30
+  sample 59:
+    time = 2374041
+    flags = 1
+    data = length 288, hash 98B5BFF6
+  sample 60:
+    time = 2398041
+    flags = 1
+    data = length 336, hash E0135533
+  sample 61:
+    time = 2422041
+    flags = 1
+    data = length 336, hash D13C9DBC
+  sample 62:
+    time = 2446041
+    flags = 1
+    data = length 336, hash 63D524CA
+  sample 63:
+    time = 2470041
+    flags = 1
+    data = length 288, hash A28514C3
+  sample 64:
+    time = 2494041
+    flags = 1
+    data = length 336, hash 72B647FF
+  sample 65:
+    time = 2518041
+    flags = 1
+    data = length 336, hash 8F740AB1
+  sample 66:
+    time = 2542041
+    flags = 1
+    data = length 336, hash 5E3C7E93
+  sample 67:
+    time = 2566041
+    flags = 1
+    data = length 336, hash 121B913B
+  sample 68:
+    time = 2590041
+    flags = 1
+    data = length 336, hash 578FCCF2
+  sample 69:
+    time = 2614041
+    flags = 1
+    data = length 336, hash 5B5823DE
+  sample 70:
+    time = 2638041
+    flags = 1
+    data = length 384, hash D8B83F78
+  sample 71:
+    time = 2662041
+    flags = 1
+    data = length 240, hash E649682F
+  sample 72:
+    time = 2686041
+    flags = 1
+    data = length 96, hash C559A6F4
+  sample 73:
+    time = 2710041
+    flags = 1
+    data = length 96, hash 792796BC
+  sample 74:
+    time = 2734041
+    flags = 1
+    data = length 120, hash 8172CD0E
+  sample 75:
+    time = 2758041
+    flags = 1
+    data = length 120, hash F562B52F
+  sample 76:
+    time = 2782041
+    flags = 1
+    data = length 96, hash FF8D5B98
+tracksEnded = true
diff --git a/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump
new file mode 100644
index 0000000000..c756efe59d
--- /dev/null
+++ b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump
@@ -0,0 +1,183 @@
+seekMap:
+  isSeekable = true
+  duration = 2808000
+  getPosition(0) = [[timeUs=0, position=237]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = null
+    containerMimeType = null
+    sampleMimeType = audio/mpeg
+    maxInputSize = 4096
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 576
+    encoderPadding = 576
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
+    initializationData:
+  total output bytes = 11328
+  sample count = 38
+  sample 0:
+    time = 1886772
+    flags = 1
+    data = length 336, hash CFD5E966
+  sample 1:
+    time = 1910772
+    flags = 1
+    data = length 288, hash DC08E267
+  sample 2:
+    time = 1934772
+    flags = 1
+    data = length 336, hash 6530CB78
+  sample 3:
+    time = 1958772
+    flags = 1
+    data = length 336, hash 6CC6636E
+  sample 4:
+    time = 1982772
+    flags = 1
+    data = length 336, hash 613047C1
+  sample 5:
+    time = 2006772
+    flags = 1
+    data = length 288, hash CDC747BF
+  sample 6:
+    time = 2030772
+    flags = 1
+    data = length 336, hash AF22AA74
+  sample 7:
+    time = 2054772
+    flags = 1
+    data = length 384, hash 82F326AA
+  sample 8:
+    time = 2078772
+    flags = 1
+    data = length 384, hash EDA26C4D
+  sample 9:
+    time = 2102772
+    flags = 1
+    data = length 336, hash 94C643DC
+  sample 10:
+    time = 2126772
+    flags = 1
+    data = length 288, hash CB5D9C40
+  sample 11:
+    time = 2150772
+    flags = 1
+    data = length 336, hash 1E69DE3F
+  sample 12:
+    time = 2174772
+    flags = 1
+    data = length 336, hash 7E472219
+  sample 13:
+    time = 2198772
+    flags = 1
+    data = length 336, hash DA47B9FA
+  sample 14:
+    time = 2222772
+    flags = 1
+    data = length 336, hash DD0ABB7C
+  sample 15:
+    time = 2246772
+    flags = 1
+    data = length 288, hash DBF93FAC
+  sample 16:
+    time = 2270772
+    flags = 1
+    data = length 336, hash 243F4B2
+  sample 17:
+    time = 2294772
+    flags = 1
+    data = length 336, hash 2E881490
+  sample 18:
+    time = 2318772
+    flags = 1
+    data = length 288, hash 1C28C8BE
+  sample 19:
+    time = 2342772
+    flags = 1
+    data = length 336, hash C73E5D30
+  sample 20:
+    time = 2366772
+    flags = 1
+    data = length 288, hash 98B5BFF6
+  sample 21:
+    time = 2390772
+    flags = 1
+    data = length 336, hash E0135533
+  sample 22:
+    time = 2414772
+    flags = 1
+    data = length 336, hash D13C9DBC
+  sample 23:
+    time = 2438772
+    flags = 1
+    data = length 336, hash 63D524CA
+  sample 24:
+    time = 2462772
+    flags = 1
+    data = length 288, hash A28514C3
+  sample 25:
+    time = 2486772
+    flags = 1
+    data = length 336, hash 72B647FF
+  sample 26:
+    time = 2510772
+    flags = 1
+    data = length 336, hash 8F740AB1
+  sample 27:
+    time = 2534772
+    flags = 1
+    data = length 336, hash 5E3C7E93
+  sample 28:
+    time = 2558772
+    flags = 1
+    data = length 336, hash 121B913B
+  sample 29:
+    time = 2582772
+    flags = 1
+    data = length 336, hash 578FCCF2
+  sample 30:
+    time = 2606772
+    flags = 1
+    data = length 336, hash 5B5823DE
+  sample 31:
+    time = 2630772
+    flags = 1
+    data = length 384, hash D8B83F78
+  sample 32:
+    time = 2654772
+    flags = 1
+    data = length 240, hash E649682F
+  sample 33:
+    time = 2678772
+    flags = 1
+    data = length 96, hash C559A6F4
+  sample 34:
+    time = 2702772
+    flags = 1
+    data = length 96, hash 792796BC
+  sample 35:
+    time = 2726772
+    flags = 1
+    data = length 120, hash 8172CD0E
+  sample 36:
+    time = 2750772
+    flags = 1
+    data = length 120, hash F562B52F
+  sample 37:
+    time = 2774772
+    flags = 1
+    data = length 96, hash FF8D5B98
+tracksEnded = true
diff --git a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.3.dump b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump
similarity index 74%
rename from library/extractor/src/test/assets/mp3/bear-xing-header.mp3.3.dump
rename to library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump
index 744244bf47..bb2bde8900 100644
--- a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.3.dump
+++ b/library/extractor/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump
@@ -1,7 +1,7 @@
 seekMap:
   isSeekable = true
-  duration = 2784000
-  getPosition(0) = [[timeUs=0, position=201]]
+  duration = 2808000
+  getPosition(0) = [[timeUs=0, position=237]]
 numberOfTracks = 1
 track 0:
   format:
@@ -18,13 +18,13 @@ track 0:
     channelCount = 2
     sampleRate = 48000
     pcmEncoding = -1
-    encoderDelay = 956
-    encoderPadding = 3352
+    encoderDelay = 576
+    encoderPadding = 576
     subsampleOffsetUs = 9223372036854775807
     selectionFlags = 0
     language = null
     drmInitData = -
-    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
+    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
     initializationData:
   total output bytes = 0
   sample count = 0
diff --git a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3 b/library/extractor/src/test/assets/mp3/bear-xing-header.mp3
deleted file mode 100644
index 0c1001ce39..0000000000
Binary files a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3 and /dev/null differ
diff --git a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.1.dump b/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.1.dump
deleted file mode 100644
index a7f7f699fb..0000000000
--- a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.1.dump
+++ /dev/null
@@ -1,339 +0,0 @@
-seekMap:
-  isSeekable = true
-  duration = 2784000
-  getPosition(0) = [[timeUs=0, position=201]]
-numberOfTracks = 1
-track 0:
-  format:
-    bitrate = -1
-    id = null
-    containerMimeType = null
-    sampleMimeType = audio/mpeg
-    maxInputSize = 4096
-    width = -1
-    height = -1
-    frameRate = -1.0
-    rotationDegrees = 0
-    pixelWidthHeightRatio = 1.0
-    channelCount = 2
-    sampleRate = 48000
-    pcmEncoding = -1
-    encoderDelay = 956
-    encoderPadding = 3352
-    subsampleOffsetUs = 9223372036854775807
-    selectionFlags = 0
-    language = null
-    drmInitData = -
-    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
-    initializationData:
-  total output bytes = 29568
-  sample count = 77
-  sample 0:
-    time = 928568
-    flags = 1
-    data = length 384, hash F7E344F4
-  sample 1:
-    time = 952568
-    flags = 1
-    data = length 384, hash 14EF6AFD
-  sample 2:
-    time = 976568
-    flags = 1
-    data = length 384, hash 61C9B92C
-  sample 3:
-    time = 1000568
-    flags = 1
-    data = length 384, hash ABE1368
-  sample 4:
-    time = 1024568
-    flags = 1
-    data = length 384, hash 6A3B8547
-  sample 5:
-    time = 1048568
-    flags = 1
-    data = length 384, hash 30E905FA
-  sample 6:
-    time = 1072568
-    flags = 1
-    data = length 384, hash 21A267CD
-  sample 7:
-    time = 1096568
-    flags = 1
-    data = length 384, hash D96A2651
-  sample 8:
-    time = 1120568
-    flags = 1
-    data = length 384, hash 72340177
-  sample 9:
-    time = 1144568
-    flags = 1
-    data = length 384, hash 9345E744
-  sample 10:
-    time = 1168568
-    flags = 1
-    data = length 384, hash FDE39E3A
-  sample 11:
-    time = 1192568
-    flags = 1
-    data = length 384, hash F0B7465
-  sample 12:
-    time = 1216568
-    flags = 1
-    data = length 384, hash 3693AB86
-  sample 13:
-    time = 1240568
-    flags = 1
-    data = length 384, hash F39719B1
-  sample 14:
-    time = 1264568
-    flags = 1
-    data = length 384, hash DA3958DC
-  sample 15:
-    time = 1288568
-    flags = 1
-    data = length 384, hash FDC7599F
-  sample 16:
-    time = 1312568
-    flags = 1
-    data = length 384, hash AEFF8471
-  sample 17:
-    time = 1336568
-    flags = 1
-    data = length 384, hash 89C92C19
-  sample 18:
-    time = 1360568
-    flags = 1
-    data = length 384, hash 5C786A4B
-  sample 19:
-    time = 1384568
-    flags = 1
-    data = length 384, hash 5ACA8B
-  sample 20:
-    time = 1408568
-    flags = 1
-    data = length 384, hash 7755974C
-  sample 21:
-    time = 1432568
-    flags = 1
-    data = length 384, hash 3934B73C
-  sample 22:
-    time = 1456568
-    flags = 1
-    data = length 384, hash DDD70A2F
-  sample 23:
-    time = 1480568
-    flags = 1
-    data = length 384, hash 8FACE2EF
-  sample 24:
-    time = 1504568
-    flags = 1
-    data = length 384, hash 4A602591
-  sample 25:
-    time = 1528568
-    flags = 1
-    data = length 384, hash D019AA2D
-  sample 26:
-    time = 1552568
-    flags = 1
-    data = length 384, hash 8A680B9D
-  sample 27:
-    time = 1576568
-    flags = 1
-    data = length 384, hash B655C959
-  sample 28:
-    time = 1600568
-    flags = 1
-    data = length 384, hash 2168336B
-  sample 29:
-    time = 1624568
-    flags = 1
-    data = length 384, hash D77F6D31
-  sample 30:
-    time = 1648568
-    flags = 1
-    data = length 384, hash 524B4B2F
-  sample 31:
-    time = 1672568
-    flags = 1
-    data = length 384, hash 4752DDFC
-  sample 32:
-    time = 1696568
-    flags = 1
-    data = length 384, hash E786727F
-  sample 33:
-    time = 1720568
-    flags = 1
-    data = length 384, hash 5DA6FB8C
-  sample 34:
-    time = 1744568
-    flags = 1
-    data = length 384, hash 92F24269
-  sample 35:
-    time = 1768568
-    flags = 1
-    data = length 384, hash CD0A3BA1
-  sample 36:
-    time = 1792568
-    flags = 1
-    data = length 384, hash 7D00409F
-  sample 37:
-    time = 1816568
-    flags = 1
-    data = length 384, hash D7ADB5FA
-  sample 38:
-    time = 1840568
-    flags = 1
-    data = length 384, hash 4A140209
-  sample 39:
-    time = 1864568
-    flags = 1
-    data = length 384, hash E801184A
-  sample 40:
-    time = 1888568
-    flags = 1
-    data = length 384, hash 53C6CF9C
-  sample 41:
-    time = 1912568
-    flags = 1
-    data = length 384, hash 19A8D99F
-  sample 42:
-    time = 1936568
-    flags = 1
-    data = length 384, hash E47EB43F
-  sample 43:
-    time = 1960568
-    flags = 1
-    data = length 384, hash 4EA329E7
-  sample 44:
-    time = 1984568
-    flags = 1
-    data = length 384, hash 1CCAAE62
-  sample 45:
-    time = 2008568
-    flags = 1
-    data = length 384, hash ED3F8C66
-  sample 46:
-    time = 2032568
-    flags = 1
-    data = length 384, hash D3D646B6
-  sample 47:
-    time = 2056568
-    flags = 1
-    data = length 384, hash 68CD1574
-  sample 48:
-    time = 2080568
-    flags = 1
-    data = length 384, hash 8CEAB382
-  sample 49:
-    time = 2104568
-    flags = 1
-    data = length 384, hash D54B1C48
-  sample 50:
-    time = 2128568
-    flags = 1
-    data = length 384, hash FFE2EE90
-  sample 51:
-    time = 2152568
-    flags = 1
-    data = length 384, hash BFE8A673
-  sample 52:
-    time = 2176568
-    flags = 1
-    data = length 384, hash 978B1C92
-  sample 53:
-    time = 2200568
-    flags = 1
-    data = length 384, hash 810CC71E
-  sample 54:
-    time = 2224568
-    flags = 1
-    data = length 384, hash 44FE42D9
-  sample 55:
-    time = 2248568
-    flags = 1
-    data = length 384, hash 2F5BB02C
-  sample 56:
-    time = 2272568
-    flags = 1
-    data = length 384, hash 77DDB90
-  sample 57:
-    time = 2296568
-    flags = 1
-    data = length 384, hash 24FB5EDA
-  sample 58:
-    time = 2320568
-    flags = 1
-    data = length 384, hash E73203C6
-  sample 59:
-    time = 2344568
-    flags = 1
-    data = length 384, hash 14B525F1
-  sample 60:
-    time = 2368568
-    flags = 1
-    data = length 384, hash 5E0F4E2E
-  sample 61:
-    time = 2392568
-    flags = 1
-    data = length 384, hash 67EE4E31
-  sample 62:
-    time = 2416568
-    flags = 1
-    data = length 384, hash 2E04EC4C
-  sample 63:
-    time = 2440568
-    flags = 1
-    data = length 384, hash 852CABA7
-  sample 64:
-    time = 2464568
-    flags = 1
-    data = length 384, hash 19928903
-  sample 65:
-    time = 2488568
-    flags = 1
-    data = length 384, hash 5DA42021
-  sample 66:
-    time = 2512568
-    flags = 1
-    data = length 384, hash 45B20B7C
-  sample 67:
-    time = 2536568
-    flags = 1
-    data = length 384, hash D108A215
-  sample 68:
-    time = 2560568
-    flags = 1
-    data = length 384, hash BD25DB7C
-  sample 69:
-    time = 2584568
-    flags = 1
-    data = length 384, hash DA7F9861
-  sample 70:
-    time = 2608568
-    flags = 1
-    data = length 384, hash CCD576F
-  sample 71:
-    time = 2632568
-    flags = 1
-    data = length 384, hash 405C1EB5
-  sample 72:
-    time = 2656568
-    flags = 1
-    data = length 384, hash 6640B74E
-  sample 73:
-    time = 2680568
-    flags = 1
-    data = length 384, hash B4E5937A
-  sample 74:
-    time = 2704568
-    flags = 1
-    data = length 384, hash CEE17733
-  sample 75:
-    time = 2728568
-    flags = 1
-    data = length 384, hash 2A0DA733
-  sample 76:
-    time = 2752568
-    flags = 1
-    data = length 384, hash 97F4129B
-tracksEnded = true
diff --git a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.2.dump b/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.2.dump
deleted file mode 100644
index 981a141120..0000000000
--- a/library/extractor/src/test/assets/mp3/bear-xing-header.mp3.2.dump
+++ /dev/null
@@ -1,183 +0,0 @@
-seekMap:
-  isSeekable = true
-  duration = 2784000
-  getPosition(0) = [[timeUs=0, position=201]]
-numberOfTracks = 1
-track 0:
-  format:
-    bitrate = -1
-    id = null
-    containerMimeType = null
-    sampleMimeType = audio/mpeg
-    maxInputSize = 4096
-    width = -1
-    height = -1
-    frameRate = -1.0
-    rotationDegrees = 0
-    pixelWidthHeightRatio = 1.0
-    channelCount = 2
-    sampleRate = 48000
-    pcmEncoding = -1
-    encoderDelay = 956
-    encoderPadding = 3352
-    subsampleOffsetUs = 9223372036854775807
-    selectionFlags = 0
-    language = null
-    drmInitData = -
-    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
-    initializationData:
-  total output bytes = 14592
-  sample count = 38
-  sample 0:
-    time = 1871586
-    flags = 1
-    data = length 384, hash E801184A
-  sample 1:
-    time = 1895586
-    flags = 1
-    data = length 384, hash 53C6CF9C
-  sample 2:
-    time = 1919586
-    flags = 1
-    data = length 384, hash 19A8D99F
-  sample 3:
-    time = 1943586
-    flags = 1
-    data = length 384, hash E47EB43F
-  sample 4:
-    time = 1967586
-    flags = 1
-    data = length 384, hash 4EA329E7
-  sample 5:
-    time = 1991586
-    flags = 1
-    data = length 384, hash 1CCAAE62
-  sample 6:
-    time = 2015586
-    flags = 1
-    data = length 384, hash ED3F8C66
-  sample 7:
-    time = 2039586
-    flags = 1
-    data = length 384, hash D3D646B6
-  sample 8:
-    time = 2063586
-    flags = 1
-    data = length 384, hash 68CD1574
-  sample 9:
-    time = 2087586
-    flags = 1
-    data = length 384, hash 8CEAB382
-  sample 10:
-    time = 2111586
-    flags = 1
-    data = length 384, hash D54B1C48
-  sample 11:
-    time = 2135586
-    flags = 1
-    data = length 384, hash FFE2EE90
-  sample 12:
-    time = 2159586
-    flags = 1
-    data = length 384, hash BFE8A673
-  sample 13:
-    time = 2183586
-    flags = 1
-    data = length 384, hash 978B1C92
-  sample 14:
-    time = 2207586
-    flags = 1
-    data = length 384, hash 810CC71E
-  sample 15:
-    time = 2231586
-    flags = 1
-    data = length 384, hash 44FE42D9
-  sample 16:
-    time = 2255586
-    flags = 1
-    data = length 384, hash 2F5BB02C
-  sample 17:
-    time = 2279586
-    flags = 1
-    data = length 384, hash 77DDB90
-  sample 18:
-    time = 2303586
-    flags = 1
-    data = length 384, hash 24FB5EDA
-  sample 19:
-    time = 2327586
-    flags = 1
-    data = length 384, hash E73203C6
-  sample 20:
-    time = 2351586
-    flags = 1
-    data = length 384, hash 14B525F1
-  sample 21:
-    time = 2375586
-    flags = 1
-    data = length 384, hash 5E0F4E2E
-  sample 22:
-    time = 2399586
-    flags = 1
-    data = length 384, hash 67EE4E31
-  sample 23:
-    time = 2423586
-    flags = 1
-    data = length 384, hash 2E04EC4C
-  sample 24:
-    time = 2447586
-    flags = 1
-    data = length 384, hash 852CABA7
-  sample 25:
-    time = 2471586
-    flags = 1
-    data = length 384, hash 19928903
-  sample 26:
-    time = 2495586
-    flags = 1
-    data = length 384, hash 5DA42021
-  sample 27:
-    time = 2519586
-    flags = 1
-    data = length 384, hash 45B20B7C
-  sample 28:
-    time = 2543586
-    flags = 1
-    data = length 384, hash D108A215
-  sample 29:
-    time = 2567586
-    flags = 1
-    data = length 384, hash BD25DB7C
-  sample 30:
-    time = 2591586
-    flags = 1
-    data = length 384, hash DA7F9861
-  sample 31:
-    time = 2615586
-    flags = 1
-    data = length 384, hash CCD576F
-  sample 32:
-    time = 2639586
-    flags = 1
-    data = length 384, hash 405C1EB5
-  sample 33:
-    time = 2663586
-    flags = 1
-    data = length 384, hash 6640B74E
-  sample 34:
-    time = 2687586
-    flags = 1
-    data = length 384, hash B4E5937A
-  sample 35:
-    time = 2711586
-    flags = 1
-    data = length 384, hash CEE17733
-  sample 36:
-    time = 2735586
-    flags = 1
-    data = length 384, hash 2A0DA733
-  sample 37:
-    time = 2759586
-    flags = 1
-    data = length 384, hash 97F4129B
-tracksEnded = true
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java
index a2c51a39c7..c699e1e2ef 100644
--- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java
+++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java
@@ -103,7 +103,7 @@ public class FlacMetadataReaderTest {
 
   @Test
   public void checkAndPeekStreamMarker_invalidData_isFalse() throws Exception {
-    ExtractorInput input = buildExtractorInput("mp3/bear-xing-header.mp3");
+    ExtractorInput input = buildExtractorInput("mp3/bear-vbr-xing-header.mp3");
 
     boolean result = FlacMetadataReader.checkAndPeekStreamMarker(input);
 
@@ -163,7 +163,7 @@ public class FlacMetadataReaderTest {
 
   @Test
   public void readStreamMarker_invalidData_throwsException() throws Exception {
-    ExtractorInput input = buildExtractorInput("mp3/bear-xing-header.mp3");
+    ExtractorInput input = buildExtractorInput("mp3/bear-vbr-xing-header.mp3");
 
     assertThrows(ParserException.class, () -> FlacMetadataReader.readStreamMarker(input));
   }
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java
index 82cfdf4e44..3f0f356aed 100644
--- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java
+++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class IndexSeekerTest {
 
-  private static final String TEST_FILE = "mp3/bear-vbr.mp3";
+  private static final String TEST_FILE = "mp3/bear-vbr-xing-header.mp3";
 
   private Mp3Extractor extractor;
   private FakeExtractorOutput extractorOutput;
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
index ed7484bdb1..a5bedf94d4 100644
--- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
+++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
@@ -26,7 +26,7 @@ public final class Mp3ExtractorTest {
 
   @Test
   public void testMp3SampleWithXingHeader() throws Exception {
-    ExtractorAsserts.assertBehavior(Mp3Extractor::new, "mp3/bear-xing-header.mp3");
+    ExtractorAsserts.assertBehavior(Mp3Extractor::new, "mp3/bear-vbr-xing-header.mp3");
   }
 
   @Test
@@ -38,7 +38,8 @@ public final class Mp3ExtractorTest {
   @Test
   public void testMp3SampleWithIndexSeeker() throws Exception {
     ExtractorAsserts.assertBehavior(
-        () -> new Mp3Extractor(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING), "mp3/bear-vbr.mp3");
+        () -> new Mp3Extractor(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING),
+        "mp3/bear-vbr-no-seek-table.mp3");
   }
 
   @Test