FakeTrackOutput: test all the formats sent

PiperOrigin-RevId: 294621946

FakeTrackOutput: test all the formats sent
PiperOrigin-RevId: 294621946
7a8ab7ce · kimvde · Oliver Woodman · 29c43b5e · 7a8ab7ce · 7a8ab7ce
Commit 7a8ab7ce authored Feb 12, 2020 by kimvde Committed by Oliver Woodman Feb 13, 2020
Showing with 298 additions and 298 deletions
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
testdata/src/test/assets/amr/sample_nb.amr.0.dump
testdata/src/test/assets/amr/sample_nb.amr.unklen.dump
testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump
testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump
testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump
testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump
testdata/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
testdata/src/test/assets/amr/sample_wb.amr.0.dump
testdata/src/test/assets/amr/sample_wb.amr.unklen.dump
testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump
testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump
testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump
testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump
testdata/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
testdata/src/test/assets/flac/bear_java.0.dump
testdata/src/test/assets/flac/bear_java.1.dump
testdata/src/test/assets/flac/bear_java.2.dump
testdata/src/test/assets/flac/bear_java.3.dump
testdata/src/test/assets/flac/bear_java.unklen.dump
--- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
+++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
@@ -81,7 +81,7 @@ public final class TsExtractorTest {
    assertThat(reader.packetsRead).isEqualTo(2);
    TrackOutput trackOutput = reader.getTrackOutput();
    assertThat(trackOutput == output.trackOutputs.get(257 /* PID of audio track. */)).isTrue();
-    assertThat(((FakeTrackOutput) trackOutput).format)
+    assertThat(((FakeTrackOutput) trackOutput).lastFormat)
        .isEqualTo(Format.createTextSampleFormat("1/257", "mime", /* selectionFlags= */ 0, "und"));
  }


--- a/testdata/src/test/assets/amr/sample_nb.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_nb.amr.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 2834
+  sample count = 218
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 2834
-  sample count = 218
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/amr/sample_nb.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_nb.amr.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 2834
+  sample count = 218
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 2834
-  sample count = 218
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(4360000) = [[timeUs=4340000, position=2827]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 2834
+  sample count = 218
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 2834
-  sample count = 218
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(4360000) = [[timeUs=4340000, position=2827]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 1898
+  sample count = 146
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 1898
-  sample count = 146
  sample 0:
    time = 1440000
    flags = 1

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(4360000) = [[timeUs=4340000, position=2827]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 949
+  sample count = 73
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 949
-  sample count = 73
  sample 0:
    time = 2900000
    flags = 1

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(4360000) = [[timeUs=4340000, position=2827]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 13
+  sample count = 1
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 13
-  sample count = 1
  sample 0:
    time = 4340000
    flags = 1

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 2834
+  sample count = 218
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 2834
-  sample count = 218
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/amr/sample_wb.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_wb.amr.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 4056
+  sample count = 169
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 4056
-  sample count = 169
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/amr/sample_wb.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_wb.amr.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 4056
+  sample count = 169
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 4056
-  sample count = 169
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3380000) = [[timeUs=3360000, position=4041]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 4056
+  sample count = 169
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 4056
-  sample count = 169
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3380000) = [[timeUs=3360000, position=4041]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 2712
+  sample count = 113
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 2712
-  sample count = 113
  sample 0:
    time = 1120000
    flags = 1

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3380000) = [[timeUs=3360000, position=4041]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 1368
+  sample count = 57
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 1368
-  sample count = 57
  sample 0:
    time = 2240000
    flags = 1

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3380000) = [[timeUs=3360000, position=4041]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 24
+  sample count = 1
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 24
-  sample count = 1
  sample 0:
    time = 3360000
    flags = 1

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 4056
+  sample count = 169
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 4056
-  sample count = 169
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 113666
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 113666
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 55652
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 55652
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3829
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 3829
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_java.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 362432
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 362432
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_native.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 182208
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 182208
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_native.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 18368
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 18368
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_native.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 9218FDB7
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 113666
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 9218FDB7
-  total output bytes = 113666
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 55652
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 9218FDB7
-  total output bytes = 55652
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3829
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 9218FDB7
-  total output bytes = 3829
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 9218FDB7
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 362432
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 362432
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 182208
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 182208
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 18368
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 18368
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_num_samples_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_num_samples_java.0.dump
@@ -5,7 +5,9 @@ seekMap:
  getPosition(1) = [[timeUs=0, position=8880], [timeUs=85333, position=13910]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -28,8 +30,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 49FA2C21
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_num_samples_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_num_samples_java.unklen.dump
@@ -5,7 +5,9 @@ seekMap:
  getPosition(1) = [[timeUs=0, position=8880], [timeUs=85333, position=13910]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -28,8 +30,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 49FA2C21
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_num_samples_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_num_samples_native.0.dump
@@ -5,7 +5,9 @@ seekMap:
  getPosition(1) = [[timeUs=0, position=8880]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_num_samples_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_num_samples_native.unklen.dump
@@ -5,7 +5,9 @@ seekMap:
  getPosition(1) = [[timeUs=0, position=8880]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_java.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 49FA2C21
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_java.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 49FA2C21
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_native.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_native.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 113666
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 113666
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 55652
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 55652
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 445
+  sample count = 1
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 445
-  sample count = 1
  sample 0:
    time = 2730666
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_java.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 362432
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 362432
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_native.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 182208
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 182208
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_native.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=153139]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 1984
+  sample count = 1
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 1984
-  sample count = 1
  sample 0:
    time = 2730666
    flags = 1

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_native.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 144086
+  sample count = 27
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 7249A1B8
-  total output bytes = 144086
-  sample count = 27
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 100240
+  sample count = 19
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 7249A1B8
-  total output bytes = 100240
-  sample count = 19
  sample 0:
    time = 837818
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 48500
+  sample count = 10
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 7249A1B8
-  total output bytes = 48500
-  sample count = 10
  sample 0:
    time = 1780363
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3385
+  sample count = 2
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 7249A1B8
-  total output bytes = 3385
-  sample count = 2
  sample 0:
    time = 2618181
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 144086
+  sample count = 27
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 7249A1B8
-  total output bytes = 144086
-  sample count = 27
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 482416
+  sample count = 27
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 482416
-  sample count = 27
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 334960
+  sample count = 19
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 334960
-  sample count = 19
  sample 0:
    time = 837818
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 169072
+  sample count = 10
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 169072
-  sample count = 10
  sample 0:
    time = 1780363
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 21616
+  sample count = 2
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 21616
-  sample count = 2
  sample 0:
    time = 2618181
    flags = 1

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2618181, position=148931]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 482416
+  sample count = 27
+  format 0:
    bitrate = 1408000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 482416
-  sample count = 27
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 113666
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 113666
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 55652
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 55652
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3829
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 3829
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_java.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 362432
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 362432
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_native.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 182208
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 182208
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_native.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 18368
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 18368
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_native.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 113666
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 113666
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 55652
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 55652
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3829
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 3829
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_java.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 362432
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
-  total output bytes = 362432
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_native.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 182208
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
-  total output bytes = 182208
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_native.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 18368
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
-  total output bytes = 18368
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_native.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=215886]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 113666
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 113666
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 55652
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 55652
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3829
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 3829
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 362432
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
-  total output bytes = 362432
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 182208
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
-  total output bytes = 182208
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 18368
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
-  total output bytes = 18368
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_picture_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=200470]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 113666
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 113666
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 55652
+  sample count = 12
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 55652
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3829
+  sample count = 2
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 3829
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_java.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 164431
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
      data = length 42, hash 83F6895
-  total output bytes = 164431
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 526272
+  sample count = 33
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
-  total output bytes = 526272
-  sample count = 33
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2645333, position=169482]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 362432
+  sample count = 23
+  format 0:
    bitrate = 1536000
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
-  total output bytes = 362432
-  sample count = 23
  sample 0:
    time = 853333
    flags = 1

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.2.dump
--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.3.dump
--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_native.unklen.dump
--- a/testdata/src/test/assets/flv/sample.flv.0.dump
+++ b/testdata/src/test/assets/flv/sample.flv.0.dump
--- a/testdata/src/test/assets/flv/sample.flv.unklen.dump
+++ b/testdata/src/test/assets/flv/sample.flv.unklen.dump
--- a/testdata/src/test/assets/mkv/full_blocks.mkv.0.dump
+++ b/testdata/src/test/assets/mkv/full_blocks.mkv.0.dump
--- a/testdata/src/test/assets/mkv/full_blocks.mkv.1.dump
+++ b/testdata/src/test/assets/mkv/full_blocks.mkv.1.dump
--- a/testdata/src/test/assets/mkv/full_blocks.mkv.2.dump
+++ b/testdata/src/test/assets/mkv/full_blocks.mkv.2.dump
--- a/testdata/src/test/assets/mkv/full_blocks.mkv.3.dump
+++ b/testdata/src/test/assets/mkv/full_blocks.mkv.3.dump
--- a/testdata/src/test/assets/mkv/full_blocks.mkv.unklen.dump
+++ b/testdata/src/test/assets/mkv/full_blocks.mkv.unklen.dump
--- a/testdata/src/test/assets/mkv/sample.mkv.0.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.0.dump
--- a/testdata/src/test/assets/mkv/sample.mkv.1.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.1.dump
--- a/testdata/src/test/assets/mkv/sample.mkv.2.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.2.dump
--- a/testdata/src/test/assets/mkv/sample.mkv.3.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.3.dump
--- a/testdata/src/test/assets/mkv/sample.mkv.unklen.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.unklen.dump
--- a/testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump
+++ b/testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump
--- a/testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.unklen.dump
+++ b/testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.unklen.dump
--- a/testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
+++ b/testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
--- a/testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.unklen.dump
+++ b/testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.unklen.dump
--- a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump
+++ b/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump
--- a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump
+++ b/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump
--- a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump
+++ b/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump
--- a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump
+++ b/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump
--- a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unklen.dump
+++ b/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unklen.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.unklen.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.unklen.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.0.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.0.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump
--- a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.unklen.dump
+++ b/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.unklen.dump
--- a/testdata/src/test/assets/mp3/play-trimmed.mp3.0.dump
+++ b/testdata/src/test/assets/mp3/play-trimmed.mp3.0.dump
--- a/testdata/src/test/assets/mp3/play-trimmed.mp3.1.dump
+++ b/testdata/src/test/assets/mp3/play-trimmed.mp3.1.dump
--- a/testdata/src/test/assets/mp3/play-trimmed.mp3.2.dump
+++ b/testdata/src/test/assets/mp3/play-trimmed.mp3.2.dump
--- a/testdata/src/test/assets/mp3/play-trimmed.mp3.3.dump
+++ b/testdata/src/test/assets/mp3/play-trimmed.mp3.3.dump
--- a/testdata/src/test/assets/mp3/play-trimmed.mp3.unklen.dump
+++ b/testdata/src/test/assets/mp3/play-trimmed.mp3.unklen.dump
--- a/testdata/src/test/assets/mp4/sample.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump
--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.unklen.dump
--- a/testdata/src/test/assets/ogg/bear.opus.0.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.0.dump
--- a/testdata/src/test/assets/ogg/bear.opus.1.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.1.dump
--- a/testdata/src/test/assets/ogg/bear.opus.2.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.2.dump
--- a/testdata/src/test/assets/ogg/bear.opus.3.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.3.dump
--- a/testdata/src/test/assets/ogg/bear.opus.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.unklen.dump
--- a/testdata/src/test/assets/ogg/bear_flac.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.0.dump
--- a/testdata/src/test/assets/ogg/bear_flac.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.1.dump
--- a/testdata/src/test/assets/ogg/bear_flac.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.2.dump
--- a/testdata/src/test/assets/ogg/bear_flac.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.3.dump
--- a/testdata/src/test/assets/ogg/bear_flac.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.unklen.dump
--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.0.dump
--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.1.dump
--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.2.dump
--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.3.dump
--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
--- a/testdata/src/test/assets/rawcc/sample.rawcc.0.dump
+++ b/testdata/src/test/assets/rawcc/sample.rawcc.0.dump
--- a/testdata/src/test/assets/rawcc/sample.rawcc.unklen.dump
+++ b/testdata/src/test/assets/rawcc/sample.rawcc.unklen.dump
--- a/testdata/src/test/assets/ts/sample.ac3.0.dump
+++ b/testdata/src/test/assets/ts/sample.ac3.0.dump
--- a/testdata/src/test/assets/ts/sample.ac3.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.ac3.unklen.dump
--- a/testdata/src/test/assets/ts/sample.ac4.0.dump
+++ b/testdata/src/test/assets/ts/sample.ac4.0.dump
--- a/testdata/src/test/assets/ts/sample.ac4.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.ac4.unklen.dump
--- a/testdata/src/test/assets/ts/sample.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample.adts.0.dump
--- a/testdata/src/test/assets/ts/sample.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.adts.unklen.dump
--- a/testdata/src/test/assets/ts/sample.eac3.0.dump
+++ b/testdata/src/test/assets/ts/sample.eac3.0.dump
--- a/testdata/src/test/assets/ts/sample.eac3.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.eac3.unklen.dump
--- a/testdata/src/test/assets/ts/sample.ps.0.dump
+++ b/testdata/src/test/assets/ts/sample.ps.0.dump
--- a/testdata/src/test/assets/ts/sample.ps.1.dump
+++ b/testdata/src/test/assets/ts/sample.ps.1.dump
--- a/testdata/src/test/assets/ts/sample.ps.2.dump
+++ b/testdata/src/test/assets/ts/sample.ps.2.dump
--- a/testdata/src/test/assets/ts/sample.ps.3.dump
+++ b/testdata/src/test/assets/ts/sample.ps.3.dump
--- a/testdata/src/test/assets/ts/sample.ps.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.ps.unklen.dump
--- a/testdata/src/test/assets/ts/sample.ts.0.dump
+++ b/testdata/src/test/assets/ts/sample.ts.0.dump
--- a/testdata/src/test/assets/ts/sample.ts.1.dump
+++ b/testdata/src/test/assets/ts/sample.ts.1.dump
--- a/testdata/src/test/assets/ts/sample.ts.2.dump
+++ b/testdata/src/test/assets/ts/sample.ts.2.dump
--- a/testdata/src/test/assets/ts/sample.ts.3.dump
+++ b/testdata/src/test/assets/ts/sample.ts.3.dump
--- a/testdata/src/test/assets/ts/sample.ts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.ts.unklen.dump
--- a/testdata/src/test/assets/ts/sample_cbs.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.0.dump
--- a/testdata/src/test/assets/ts/sample_cbs.adts.1.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.1.dump
--- a/testdata/src/test/assets/ts/sample_cbs.adts.2.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.2.dump
--- a/testdata/src/test/assets/ts/sample_cbs.adts.3.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.3.dump
--- a/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
--- a/testdata/src/test/assets/ts/sample_with_junk.0.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.0.dump
--- a/testdata/src/test/assets/ts/sample_with_junk.1.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.1.dump
--- a/testdata/src/test/assets/ts/sample_with_junk.2.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.2.dump
--- a/testdata/src/test/assets/ts/sample_with_junk.3.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.3.dump
--- a/testdata/src/test/assets/ts/sample_with_junk.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.unklen.dump
--- a/testdata/src/test/assets/wav/sample.wav.0.dump
+++ b/testdata/src/test/assets/wav/sample.wav.0.dump
--- a/testdata/src/test/assets/wav/sample.wav.1.dump
+++ b/testdata/src/test/assets/wav/sample.wav.1.dump
--- a/testdata/src/test/assets/wav/sample.wav.2.dump
+++ b/testdata/src/test/assets/wav/sample.wav.2.dump
--- a/testdata/src/test/assets/wav/sample.wav.3.dump
+++ b/testdata/src/test/assets/wav/sample.wav.3.dump
--- a/testdata/src/test/assets/wav/sample.wav.unklen.dump
+++ b/testdata/src/test/assets/wav/sample.wav.unklen.dump
--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump
--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump
--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump
--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump
--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unklen.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unklen.dump
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java