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 1119 additions and 1017 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
@@ -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 = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
-  total output bytes = 182208
-  sample count = 12
  sample 0:
    time = 1792000
    flags = 1

--- 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
@@ -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 = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
-  total output bytes = 18368
-  sample count = 2
  sample 0:
    time = 2645333
    flags = 1

--- 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
@@ -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/flv/sample.flv.0.dump
+++ b/testdata/src/test/assets/flv/sample.flv.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 8:
-  format:
+  total output bytes = 9529
+  sample count = 45
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -27,8 +29,6 @@ track 8:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 9529
-  sample count = 45
  sample 0:
    time = 112000
    flags = 1
@@ -210,7 +210,9 @@ track 8:
    flags = 1
    data = length 6, hash 31B22286
 track 9:
-  format:
+  total output bytes = 89502
+  sample count = 30
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -234,8 +236,6 @@ track 9:
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89502
-  sample count = 30
  sample 0:
    time = 67000
    flags = 1

--- a/testdata/src/test/assets/flv/sample.flv.unklen.dump
+++ b/testdata/src/test/assets/flv/sample.flv.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 8:
-  format:
+  total output bytes = 9529
+  sample count = 45
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -27,8 +29,6 @@ track 8:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 9529
-  sample count = 45
  sample 0:
    time = 112000
    flags = 1
@@ -210,7 +210,9 @@ track 8:
    flags = 1
    data = length 6, hash 31B22286
 track 9:
-  format:
+  total output bytes = 89502
+  sample count = 30
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -234,8 +236,6 @@ track 9:
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89502
-  sample count = 30
  sample 0:
    time = 67000
    flags = 1

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

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

--- a/testdata/src/test/assets/mkv/full_blocks.mkv.2.dump
+++ b/testdata/src/test/assets/mkv/full_blocks.mkv.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(8901000) = [[timeUs=4567000, position=5401]]
 numberOfTracks = 1
 track 1:
-  format:
+  total output bytes = 213
+  sample count = 3
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 213
-  sample count = 3
  sample 0:
    time = 0
    flags = 1

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

--- a/testdata/src/test/assets/mkv/full_blocks.mkv.unklen.dump
+++ b/testdata/src/test/assets/mkv/full_blocks.mkv.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(8901000) = [[timeUs=4567000, position=5401]]
 numberOfTracks = 1
 track 1:
-  format:
+  total output bytes = 213
+  sample count = 3
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 213
-  sample count = 3
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mkv/sample.mkv.0.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1104000) = [[timeUs=1035000, position=106570]]
 numberOfTracks = 2
 track 1:
-  format:
+  total output bytes = 89502
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 1:
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89502
-  sample count = 30
  sample 0:
    time = 67000
    flags = 1
@@ -154,7 +154,9 @@ track 1:
    flags = 0
    data = length 486, hash DDF32CBB
 track 2:
-  format:
+  total output bytes = 12120
+  sample count = 29
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -176,8 +178,6 @@ track 2:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 12120
-  sample count = 29
  sample 0:
    time = 129000
    flags = 1

--- a/testdata/src/test/assets/mkv/sample.mkv.1.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1104000) = [[timeUs=1035000, position=106570]]
 numberOfTracks = 2
 track 1:
-  format:
+  total output bytes = 29422
+  sample count = 20
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 1:
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
-  total output bytes = 29422
-  sample count = 20
  sample 0:
    time = 367000
    flags = 0
@@ -114,7 +114,9 @@ track 1:
    flags = 0
    data = length 486, hash DDF32CBB
 track 2:
-  format:
+  total output bytes = 8778
+  sample count = 21
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -136,8 +138,6 @@ track 2:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 8778
-  sample count = 21
  sample 0:
    time = 408000
    flags = 1

--- a/testdata/src/test/assets/mkv/sample.mkv.2.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1104000) = [[timeUs=1035000, position=106570]]
 numberOfTracks = 2
 track 1:
-  format:
+  total output bytes = 8360
+  sample count = 9
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 1:
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
-  total output bytes = 8360
-  sample count = 9
  sample 0:
    time = 734000
    flags = 0
@@ -70,7 +70,9 @@ track 1:
    flags = 0
    data = length 486, hash DDF32CBB
 track 2:
-  format:
+  total output bytes = 4180
+  sample count = 10
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -92,8 +94,6 @@ track 2:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 4180
-  sample count = 10
  sample 0:
    time = 791000
    flags = 1

--- a/testdata/src/test/assets/mkv/sample.mkv.3.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1104000) = [[timeUs=1035000, position=106570]]
 numberOfTracks = 2
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,10 +33,10 @@ track 1:
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
-  total output bytes = 0
-  sample count = 0
 track 2:
-  format:
+  total output bytes = 1254
+  sample count = 3
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -56,8 +58,6 @@ track 2:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 1254
-  sample count = 3
  sample 0:
    time = 1035000
    flags = 1

--- a/testdata/src/test/assets/mkv/sample.mkv.unklen.dump
+++ b/testdata/src/test/assets/mkv/sample.mkv.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1104000) = [[timeUs=1035000, position=106570]]
 numberOfTracks = 2
 track 1:
-  format:
+  total output bytes = 89502
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 1:
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89502
-  sample count = 30
  sample 0:
    time = 67000
    flags = 1
@@ -154,7 +154,9 @@ track 1:
    flags = 0
    data = length 486, hash DDF32CBB
 track 2:
-  format:
+  total output bytes = 12120
+  sample count = 29
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -176,8 +178,6 @@ track 2:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 12120
-  sample count = 29
  sample 0:
    time = 129000
    flags = 1

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

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

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

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

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2821187) = [[timeUs=2795125, position=44962]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 45139
+  sample count = 108
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 45139
-  sample count = 108
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2821187) = [[timeUs=2795125, position=44962]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 30093
+  sample count = 72
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 30093
-  sample count = 72
  sample 0:
    time = 940375
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2821187) = [[timeUs=2795125, position=44962]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 15046
+  sample count = 36
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 15046
-  sample count = 36
  sample 0:
    time = 1880812
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2821187) = [[timeUs=2795125, position=44962]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,6 +31,4 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- 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
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=240]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 45139
+  sample count = 108
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 45139
-  sample count = 108
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2760000, position=38168]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 38160
+  sample count = 117
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 38160
-  sample count = 117
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2760000, position=38168]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 25920
+  sample count = 82
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 25920
-  sample count = 82
  sample 0:
    time = 840000
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2760000, position=38168]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 12624
+  sample count = 42
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 12624
-  sample count = 42
  sample 0:
    time = 1800000
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2760000, position=38168]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 216
+  sample count = 2
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 216
-  sample count = 2
  sample 0:
    time = 2760000
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2760000, position=38168]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 38160
+  sample count = 117
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 38160
-  sample count = 117
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2808000, position=38396]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 38160
+  sample count = 117
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
    initializationData:
-  total output bytes = 38160
-  sample count = 117
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2808000, position=38396]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 24384
+  sample count = 77
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
    initializationData:
-  total output bytes = 24384
-  sample count = 77
  sample 0:
    time = 958041
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2808000, position=38396]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 11328
+  sample count = 38
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
    initializationData:
-  total output bytes = 11328
-  sample count = 38
  sample 0:
    time = 1886772
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2808000, position=38396]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,6 +31,4 @@ track 0:
    drmInitData = -
    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2808000) = [[timeUs=2808000, position=38396]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 38160
+  sample count = 117
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = entries=[TSSE: description=null: value=Lavf58.29.100]
    initializationData:
-  total output bytes = 38160
-  sample count = 117
  sample 0:
    time = 0
    flags = 1

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

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

--- a/testdata/src/test/assets/mp3/play-trimmed.mp3.2.dump
+++ b/testdata/src/test/assets/mp3/play-trimmed.mp3.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(26125) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 418
+  sample count = 1
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 418
-  sample count = 1
  sample 0:
    time = 0
    flags = 1

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

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

--- a/testdata/src/test/assets/mp4/sample.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=48]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 9529
+  sample count = 45
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 9529
-  sample count = 45
  sample 0:
    time = 44000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=48]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 7464
+  sample count = 33
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 7464
-  sample count = 33
  sample 0:
    time = 322639
    flags = 1

--- a/testdata/src/test/assets/mp4/sample.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=48]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 4019
+  sample count = 18
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 4019
-  sample count = 18
  sample 0:
    time = 670938
    flags = 1

--- a/testdata/src/test/assets/mp4/sample.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=48]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 470
+  sample count = 3
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 470
-  sample count = 3
  sample 0:
    time = 1019238
    flags = 1

--- a/testdata/src/test/assets/mp4/sample.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=48]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 9529
+  sample count = 45
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 9529
-  sample count = 45
  sample 0:
    time = 44000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=760000, position=758]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7613
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 7613
-  sample count = 19
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=760000, position=758]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7613
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 7613
-  sample count = 19
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=760000, position=758]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7613
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 7613
-  sample count = 19
  sample 0:
    time = 0
    flags = 1

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

--- a/testdata/src/test/assets/mp4/sample_ac4.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4.mp4.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=760000, position=758]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7613
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 7613
-  sample count = 19
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=685]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7613
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 7613
-  sample count = 19
  sample 0:
    time = 0
    flags = 1

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

--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=685]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3081
+  sample count = 7
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 3081
-  sample count = 7
  sample 0:
    time = 480000
    flags = 1

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

--- a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=685]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7613
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 7613
-  sample count = 19
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=950]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7936
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -1683793742
    metadata = null
    initializationData:
-  total output bytes = 7936
-  sample count = 19
  sample 0:
    time = 0
    flags = 1073741825

--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=950]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 5632
+  sample count = 13
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -1683793742
    metadata = null
    initializationData:
-  total output bytes = 5632
-  sample count = 13
  sample 0:
    time = 240000
    flags = 1073741825

--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=950]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 3200
+  sample count = 7
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -1683793742
    metadata = null
    initializationData:
-  total output bytes = 3200
-  sample count = 7
  sample 0:
    time = 480000
    flags = 1073741825

--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=950]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 410
+  sample count = 1
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -1683793742
    metadata = null
    initializationData:
-  total output bytes = 410
-  sample count = 1
  sample 0:
    time = 720000
    flags = 1073741825

--- a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(760000) = [[timeUs=0, position=950]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 7936
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -1683793742
    metadata = null
    initializationData:
-  total output bytes = 7936
-  sample count = 19
  sample 0:
    time = 0
    flags = 1073741825

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(526000) = [[timeUs=0, position=1161]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 42320
+  sample count = 7
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 22, hash 4CF81805
      data = length 9, hash FBAFBA1C
-  total output bytes = 42320
-  sample count = 7
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(526000) = [[timeUs=0, position=1161]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 42320
+  sample count = 7
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 22, hash 4CF81805
      data = length 9, hash FBAFBA1C
-  total output bytes = 42320
-  sample count = 7
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(526000) = [[timeUs=0, position=1161]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 42320
+  sample count = 7
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 22, hash 4CF81805
      data = length 9, hash FBAFBA1C
-  total output bytes = 42320
-  sample count = 7
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(526000) = [[timeUs=0, position=1161]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 42320
+  sample count = 7
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 22, hash 4CF81805
      data = length 9, hash FBAFBA1C
-  total output bytes = 42320
-  sample count = 7
  sample 0:
    time = 0
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(526000) = [[timeUs=0, position=1161]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 42320
+  sample count = 7
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 22, hash 4CF81805
      data = length 9, hash FBAFBA1C
-  total output bytes = 42320
-  sample count = 7
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=1728000, position=212898]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 216000
+  sample count = 54
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 216000
-  sample count = 54
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=1728000, position=212898]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 144000
+  sample count = 36
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 144000
-  sample count = 36
  sample 0:
    time = 576000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=1728000, position=212898]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 72000
+  sample count = 18
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 72000
-  sample count = 18
  sample 0:
    time = 1152000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=1728000, position=212898]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 4000
+  sample count = 1
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 4000
-  sample count = 1
  sample 0:
    time = 1696000
    flags = 536870913

--- a/testdata/src/test/assets/mp4/sample_eac3.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3.mp4.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=1728000, position=212898]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 216000
+  sample count = 54
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 216000
-  sample count = 54
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=0, position=638]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 216000
+  sample count = 54
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 216000
-  sample count = 54
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=0, position=638]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 148000
+  sample count = 37
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 148000
-  sample count = 37
  sample 0:
    time = 544000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=0, position=638]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 76000
+  sample count = 19
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 76000
-  sample count = 19
  sample 0:
    time = 1120000
    flags = 1

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

--- a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1728000) = [[timeUs=0, position=638]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 216000
+  sample count = 54
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 216000
-  sample count = 54
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=1828]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -28,8 +30,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -151,7 +151,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 18257
+  sample count = 46
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -174,8 +176,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 18257
-  sample count = 46
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=1828]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -28,8 +30,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -151,7 +151,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 18257
+  sample count = 46
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -174,8 +176,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 18257
-  sample count = 46
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1067733) = [[timeUs=66733, position=1325]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 18257
+  sample count = 46
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 18257
-  sample count = 46
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1067733) = [[timeUs=66733, position=1325]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 13359
+  sample count = 31
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 13359
-  sample count = 31
  sample 0:
    time = 348000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1067733) = [[timeUs=66733, position=1325]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 6804
+  sample count = 16
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 6804
-  sample count = 16
  sample 0:
    time = 696000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1067733) = [[timeUs=66733, position=1325]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 10
+  sample count = 1
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 10
-  sample count = 1
  sample 0:
    time = 1044000
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1067733) = [[timeUs=66733, position=1325]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 18257
+  sample count = 46
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 18257
-  sample count = 46
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=1828]]
 numberOfTracks = 3
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -28,8 +30,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -151,7 +151,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 18257
+  sample count = 46
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -174,8 +176,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 18257
-  sample count = 46
  sample 0:
    time = 0
    flags = 1
@@ -361,7 +361,9 @@ track 1:
    flags = 1
    data = length 10, hash A453EEBE
 track 3:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -383,6 +385,4 @@ track 3:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=1828]]
 numberOfTracks = 3
 track 0:
-  format:
+  total output bytes = 85933
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -28,8 +30,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 85933
-  sample count = 30
  sample 0:
    time = 66000
    flags = 1
@@ -151,7 +151,9 @@ track 0:
    flags = 0
    data = length 619, hash AB5E56CA
 track 1:
-  format:
+  total output bytes = 18257
+  sample count = 46
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -174,8 +176,6 @@ track 1:
    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
-  total output bytes = 18257
-  sample count = 46
  sample 0:
    time = 0
    flags = 1
@@ -361,7 +361,9 @@ track 1:
    flags = 1
    data = length 10, hash A453EEBE
 track 3:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -383,6 +385,4 @@ track 3:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=2192]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 9529
+  sample count = 45
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 9529
-  sample count = 45
  sample 0:
    time = 44000
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=2192]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 7464
+  sample count = 33
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 7464
-  sample count = 33
  sample 0:
    time = 322639
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=2192]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 4019
+  sample count = 18
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 4019
-  sample count = 18
  sample 0:
    time = 670938
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=2192]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 470
+  sample count = 3
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 470
-  sample count = 3
  sample 0:
    time = 1019238
    flags = 1

--- 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
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1024000) = [[timeUs=0, position=2192]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 89876
+  sample count = 30
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
-  total output bytes = 89876
-  sample count = 30
  sample 0:
    time = 0
    flags = 1
@@ -154,7 +154,9 @@ track 0:
    flags = 536870912
    data = length 568, hash 4FE5C8EA
 track 1:
-  format:
+  total output bytes = 9529
+  sample count = 45
+  format 0:
    bitrate = -1
    id = 2
    containerMimeType = null
@@ -177,8 +179,6 @@ track 1:
    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 9529
-  sample count = 45
  sample 0:
    time = 44000
    flags = 1

--- a/testdata/src/test/assets/ogg/bear.opus.0.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2747500) = [[timeUs=2747500, position=125]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 25541
+  sample count = 275
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -32,8 +34,6 @@ track 0:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C
      data = length 8, hash 79C07075
-  total output bytes = 25541
-  sample count = 275
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/ogg/bear.opus.1.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2747500) = [[timeUs=2747500, position=125]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 17031
+  sample count = 184
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -32,8 +34,6 @@ track 0:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C
      data = length 8, hash 79C07075
-  total output bytes = 17031
-  sample count = 184
  sample 0:
    time = 910000
    flags = 1

--- a/testdata/src/test/assets/ogg/bear.opus.2.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2747500) = [[timeUs=2747500, position=125]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 8698
+  sample count = 92
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -32,8 +34,6 @@ track 0:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C
      data = length 8, hash 79C07075
-  total output bytes = 8698
-  sample count = 92
  sample 0:
    time = 1830000
    flags = 1

--- a/testdata/src/test/assets/ogg/bear.opus.3.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2747500) = [[timeUs=2747500, position=125]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 126
+  sample count = 1
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -32,8 +34,6 @@ track 0:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C
      data = length 8, hash 79C07075
-  total output bytes = 126
-  sample count = 1
  sample 0:
    time = 2741000
    flags = 1

--- a/testdata/src/test/assets/ogg/bear.opus.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear.opus.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 25541
+  sample count = 275
+  format 0:
    bitrate = -1
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C
      data = length 8, hash 79C07075
-  total output bytes = 25541
-  sample count = 275
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/ogg/bear_flac.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=0, position=8457]]
 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/ogg/bear_flac.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=0, position=8457]]
 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/ogg/bear_flac.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=0, position=8457]]
 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/ogg/bear_flac.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=0, position=8457]]
 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/ogg/bear_flac.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=0, position=8457]]
 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/ogg/bear_flac_noseektable.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=143746]]
 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/ogg/bear_flac_noseektable.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=143746]]
 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/ogg/bear_flac_noseektable.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=143746]]
 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/ogg/bear_flac_noseektable.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=143746]]
 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/ogg/bear_flac_noseektable.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.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/ogg/bear_vorbis.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=3995]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 26873
+  sample count = 180
+  format 0:
    bitrate = 112000
    id = null
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249
-  total output bytes = 26873
-  sample count = 180
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=3995]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 17598
+  sample count = 109
+  format 0:
    bitrate = 112000
    id = null
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249
-  total output bytes = 17598
-  sample count = 109
  sample 0:
    time = 896000
    flags = 1

--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=3995]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 8658
+  sample count = 49
+  format 0:
    bitrate = 112000
    id = null
    containerMimeType = null
@@ -31,8 +33,6 @@ track 0:
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249
-  total output bytes = 8658
-  sample count = 49
  sample 0:
    time = 1821333
    flags = 1

--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(2741000) = [[timeUs=2741000, position=3995]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = 112000
    id = null
    containerMimeType = null
@@ -31,6 +33,4 @@ track 0:
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 26873
+  sample count = 180
+  format 0:
    bitrate = 112000
    id = null
    containerMimeType = null
@@ -28,8 +30,6 @@ track 0:
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249
-  total output bytes = 26873
-  sample count = 180
  sample 0:
    time = 0
    flags = 1

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

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

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

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

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

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

--- a/testdata/src/test/assets/ts/sample.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample.adts.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 30797
+  sample count = 144
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 30797
-  sample count = 144
  sample 0:
    time = 0
    flags = 1
@@ -606,7 +606,9 @@ track 0:
    flags = 1
    data = length 174, hash 2B69C34E
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -628,6 +630,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.adts.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 30797
+  sample count = 144
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 30797
-  sample count = 144
  sample 0:
    time = 0
    flags = 1
@@ -606,7 +606,9 @@ track 0:
    flags = 1
    data = length 174, hash 2B69C34E
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -628,6 +630,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.eac3.0.dump
+++ b/testdata/src/test/assets/ts/sample.eac3.0.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 216000
+  sample count = 54
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -26,8 +28,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 216000
-  sample count = 54
  sample 0:
    time = 0
    flags = 1

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

--- a/testdata/src/test/assets/ts/sample.ps.0.dump
+++ b/testdata/src/test/assets/ts/sample.ps.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(766) = [[timeUs=766, position=46445]]
 numberOfTracks = 2
 track 192:
-  format:
+  total output bytes = 1671
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 192
    containerMimeType = null
@@ -29,8 +31,6 @@ track 192:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 1671
-  sample count = 4
  sample 0:
    time = 29088
    flags = 1
@@ -48,7 +48,9 @@ track 192:
    flags = 1
    data = length 418, hash 79CF71F8
 track 224:
-  format:
+  total output bytes = 44056
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 224
    containerMimeType = null
@@ -71,8 +73,6 @@ track 224:
    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
-  total output bytes = 44056
-  sample count = 2
  sample 0:
    time = 40000
    flags = 1

--- a/testdata/src/test/assets/ts/sample.ps.1.dump
+++ b/testdata/src/test/assets/ts/sample.ps.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(766) = [[timeUs=766, position=46445]]
 numberOfTracks = 2
 track 192:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 192
    containerMimeType = null
@@ -29,10 +31,10 @@ track 192:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 track 224:
-  format:
+  total output bytes = 33949
+  sample count = 1
+  format 0:
    bitrate = -1
    id = 224
    containerMimeType = null
@@ -55,8 +57,6 @@ track 224:
    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
-  total output bytes = 33949
-  sample count = 1
  sample 0:
    time = 80000
    flags = 0

--- a/testdata/src/test/assets/ts/sample.ps.2.dump
+++ b/testdata/src/test/assets/ts/sample.ps.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(766) = [[timeUs=766, position=46445]]
 numberOfTracks = 2
 track 192:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 192
    containerMimeType = null
@@ -29,10 +31,10 @@ track 192:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 track 224:
-  format:
+  total output bytes = 19791
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 224
    containerMimeType = null
@@ -55,6 +57,4 @@ track 224:
    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
-  total output bytes = 19791
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.ps.3.dump
+++ b/testdata/src/test/assets/ts/sample.ps.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(766) = [[timeUs=766, position=46445]]
 numberOfTracks = 2
 track 192:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 192
    containerMimeType = null
@@ -29,10 +31,10 @@ track 192:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 track 224:
-  format:
+  total output bytes = 1585
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 224
    containerMimeType = null
@@ -55,6 +57,4 @@ track 224:
    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
-  total output bytes = 1585
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.ps.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.ps.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 192:
-  format:
+  total output bytes = 1671
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 192
    containerMimeType = null
@@ -26,8 +28,6 @@ track 192:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 1671
-  sample count = 4
  sample 0:
    time = 29088
    flags = 1
@@ -45,7 +45,9 @@ track 192:
    flags = 1
    data = length 418, hash 79CF71F8
 track 224:
-  format:
+  total output bytes = 44056
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 224
    containerMimeType = null
@@ -68,8 +70,6 @@ track 224:
    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
-  total output bytes = 44056
-  sample count = 2
  sample 0:
    time = 40000
    flags = 1

--- a/testdata/src/test/assets/ts/sample.ts.0.dump
+++ b/testdata/src/test/assets/ts/sample.ts.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=51606]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,8 +32,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 33366
    flags = 1
@@ -41,7 +41,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -63,8 +65,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 22455
    flags = 1
@@ -82,7 +82,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -104,6 +106,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.ts.1.dump
+++ b/testdata/src/test/assets/ts/sample.ts.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=51606]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,8 +32,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 55610
    flags = 1
@@ -41,7 +41,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -63,8 +65,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 44699
    flags = 1
@@ -82,7 +82,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -104,6 +106,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.ts.2.dump
+++ b/testdata/src/test/assets/ts/sample.ts.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=51606]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,8 +32,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 77854
    flags = 1
@@ -41,7 +41,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -63,8 +65,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 66943
    flags = 1
@@ -82,7 +82,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -104,6 +106,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.ts.3.dump
+++ b/testdata/src/test/assets/ts/sample.ts.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=51606]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,10 +32,10 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 0
-  sample count = 0
 track 257:
-  format:
+  total output bytes = 2508
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -55,8 +57,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 2508
-  sample count = 2
  sample 0:
    time = 66733
    flags = 1
@@ -66,7 +66,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -88,6 +90,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample.ts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.ts.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -27,8 +29,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 33366
    flags = 1
@@ -38,7 +38,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -60,8 +62,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 22455
    flags = 1
@@ -79,7 +79,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -101,6 +103,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3356772) = [[timeUs=3333553, position=31585]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 30797
+  sample count = 144
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 30797
-  sample count = 144
  sample 0:
    time = 0
    flags = 1
@@ -609,7 +609,9 @@ track 0:
    flags = 1
    data = length 174, hash 2B69C34E
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -631,6 +633,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs.adts.1.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3356772) = [[timeUs=3333553, position=31585]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 20533
+  sample count = 94
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 20533
-  sample count = 94
  sample 0:
    time = 1118924
    flags = 1
@@ -409,7 +409,9 @@ track 0:
    flags = 1
    data = length 174, hash 2B69C34E
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -431,6 +433,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs.adts.2.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3356772) = [[timeUs=3333553, position=31585]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 10161
+  sample count = 49
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 10161
-  sample count = 49
  sample 0:
    time = 2237848
    flags = 1
@@ -229,7 +229,9 @@ track 0:
    flags = 1
    data = length 174, hash 2B69C34E
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -251,6 +253,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs.adts.3.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3356772) = [[timeUs=3333553, position=31585]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 174
+  sample count = 1
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,14 +32,14 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 174
-  sample count = 1
  sample 0:
    time = 3356772
    flags = 1
    data = length 174, hash 2B69C34E
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -59,6 +61,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 30797
+  sample count = 144
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 30797
-  sample count = 144
  sample 0:
    time = 0
    flags = 1
@@ -606,7 +606,9 @@ track 0:
    flags = 1
    data = length 174, hash 2B69C34E
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -628,6 +630,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3355717) = [[timeUs=3332497, position=31575]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 30787
+  sample count = 143
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 30787
-  sample count = 143
  sample 0:
    time = 0
    flags = 1
@@ -605,7 +605,9 @@ track 0:
    flags = 1
    data = length 232, hash A330F188
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -627,6 +629,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3355717) = [[timeUs=3332497, position=31575]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 20523
+  sample count = 93
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 20523
-  sample count = 93
  sample 0:
    time = 1118572
    flags = 1
@@ -405,7 +405,9 @@ track 0:
    flags = 1
    data = length 232, hash A330F188
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -427,6 +429,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3355717) = [[timeUs=3332497, position=31575]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 10151
+  sample count = 48
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,8 +32,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 10151
-  sample count = 48
  sample 0:
    time = 2237144
    flags = 1
@@ -225,7 +225,9 @@ track 0:
    flags = 1
    data = length 232, hash A330F188
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -247,6 +249,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(3355717) = [[timeUs=3332497, position=31575]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 164
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -30,10 +32,10 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 164
-  sample count = 0
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -55,6 +57,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 0:
-  format:
+  total output bytes = 30787
+  sample count = 143
+  format 0:
    bitrate = -1
    id = 0
    containerMimeType = null
@@ -27,8 +29,6 @@ track 0:
    metadata = null
    initializationData:
      data = length 2, hash 5F7
-  total output bytes = 30787
-  sample count = 143
  sample 0:
    time = 0
    flags = 1
@@ -602,7 +602,9 @@ track 0:
    flags = 1
    data = length 232, hash A330F188
 track 1:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1
    containerMimeType = null
@@ -624,6 +626,4 @@ track 1:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_with_junk.0.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=56751]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,8 +32,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 33366
    flags = 1
@@ -41,7 +41,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -63,8 +65,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 22455
    flags = 1
@@ -82,7 +82,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -104,6 +106,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_with_junk.1.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=56751]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,8 +32,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 55610
    flags = 1
@@ -41,7 +41,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -63,8 +65,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 44699
    flags = 1
@@ -82,7 +82,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -104,6 +106,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_with_junk.2.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=56751]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,8 +32,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 77854
    flags = 1
@@ -41,7 +41,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -63,8 +65,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 66943
    flags = 1
@@ -82,7 +82,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -104,6 +106,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_with_junk.3.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(66733) = [[timeUs=66733, position=56751]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -30,10 +32,10 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 0
-  sample count = 0
 track 257:
-  format:
+  total output bytes = 2508
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -55,8 +57,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 2508
-  sample count = 2
  sample 0:
    time = 66733
    flags = 1
@@ -66,7 +66,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -88,6 +90,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/ts/sample_with_junk.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_with_junk.unklen.dump
@@ -4,7 +4,9 @@ seekMap:
  getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 3
 track 256:
-  format:
+  total output bytes = 45026
+  sample count = 2
+  format 0:
    bitrate = -1
    id = 1/256
    containerMimeType = null
@@ -27,8 +29,6 @@ track 256:
    metadata = null
    initializationData:
      data = length 22, hash CE183139
-  total output bytes = 45026
-  sample count = 2
  sample 0:
    time = 33366
    flags = 1
@@ -38,7 +38,9 @@ track 256:
    flags = 0
    data = length 18112, hash EC44B35B
 track 257:
-  format:
+  total output bytes = 5015
+  sample count = 4
+  format 0:
    bitrate = -1
    id = 1/257
    containerMimeType = null
@@ -60,8 +62,6 @@ track 257:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 5015
-  sample count = 4
  sample 0:
    time = 22455
    flags = 1
@@ -79,7 +79,9 @@ track 257:
    flags = 1
    data = length 1254, hash 73FB07B8
 track 8448:
-  format:
+  total output bytes = 0
+  sample count = 0
+  format 0:
    bitrate = -1
    id = 1/8448
    containerMimeType = null
@@ -101,6 +103,4 @@ track 8448:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 0
-  sample count = 0
 tracksEnded = true
--- a/testdata/src/test/assets/wav/sample.wav.0.dump
+++ b/testdata/src/test/assets/wav/sample.wav.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1000000) = [[timeUs=999977, position=88276]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 88200
+  sample count = 10
+  format 0:
    bitrate = 705600
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 88200
-  sample count = 10
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/wav/sample.wav.1.dump
+++ b/testdata/src/test/assets/wav/sample.wav.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1000000) = [[timeUs=999977, position=88276]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 58802
+  sample count = 7
+  format 0:
    bitrate = 705600
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 58802
-  sample count = 7
  sample 0:
    time = 333333
    flags = 1

--- a/testdata/src/test/assets/wav/sample.wav.2.dump
+++ b/testdata/src/test/assets/wav/sample.wav.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1000000) = [[timeUs=999977, position=88276]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 29402
+  sample count = 4
+  format 0:
    bitrate = 705600
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 29402
-  sample count = 4
  sample 0:
    time = 666666
    flags = 1

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

--- a/testdata/src/test/assets/wav/sample.wav.unklen.dump
+++ b/testdata/src/test/assets/wav/sample.wav.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1000000) = [[timeUs=999977, position=88276]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 88200
+  sample count = 10
+  format 0:
    bitrate = 705600
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 88200
-  sample count = 10
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1018185) = [[timeUs=971904, position=21598]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 89804
+  sample count = 11
+  format 0:
    bitrate = 177004
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 89804
-  sample count = 11
  sample 0:
    time = 0
    flags = 1

--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1018185) = [[timeUs=971904, position=21598]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 61230
+  sample count = 7
+  format 0:
    bitrate = 177004
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 61230
-  sample count = 7
  sample 0:
    time = 339395
    flags = 1

--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1018185) = [[timeUs=971904, position=21598]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 32656
+  sample count = 4
+  format 0:
    bitrate = 177004
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 32656
-  sample count = 4
  sample 0:
    time = 678790
    flags = 1

--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1018185) = [[timeUs=971904, position=21598]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 4082
+  sample count = 1
+  format 0:
    bitrate = 177004
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 4082
-  sample count = 1
  sample 0:
    time = 1018185
    flags = 1

--- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unklen.dump
+++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unklen.dump
@@ -7,7 +7,9 @@ seekMap:
  getPosition(1018185) = [[timeUs=971904, position=21598]]
 numberOfTracks = 1
 track 0:
-  format:
+  total output bytes = 89804
+  sample count = 11
+  format 0:
    bitrate = 177004
    id = null
    containerMimeType = null
@@ -29,8 +31,6 @@ track 0:
    drmInitData = -
    metadata = null
    initializationData:
-  total output bytes = 89804
-  sample count = 11
  sample 0:
    time = 0
    flags = 1

--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.testutil.Dumper.Dumpable;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
@@ -30,45 +31,37 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import org.checkerframework.checker.nullness.compatqual.NullableType;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 /**
 * A fake {@link TrackOutput}.
 */
 public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
-  private final ArrayList<Long> sampleTimesUs;
+  private final ArrayList<DumpableSampleInfo> sampleInfos;
-  private final ArrayList<Integer> sampleFlags;
+  private final ArrayList<Dumpable> dumpables;
-  private final ArrayList<Integer> sampleStartOffsets;
-  private final ArrayList<Integer> sampleEndOffsets;
-  private final ArrayList<@NullableType CryptoData> cryptoDatas;
  private byte[] sampleData;
-  public @MonotonicNonNull Format format;
+  private int formatCount;
+  @Nullable public Format lastFormat;
  public FakeTrackOutput() {
+    sampleInfos = new ArrayList<>();
+    dumpables = new ArrayList<>();
    sampleData = Util.EMPTY_BYTE_ARRAY;
-    sampleTimesUs = new ArrayList<>();
+    formatCount = 0;
-    sampleFlags = new ArrayList<>();
-    sampleStartOffsets = new ArrayList<>();
-    sampleEndOffsets = new ArrayList<>();
-    cryptoDatas = new ArrayList<>();
  }
  public void clear() {
+    sampleInfos.clear();
+    dumpables.clear();
    sampleData = Util.EMPTY_BYTE_ARRAY;
-    sampleTimesUs.clear();
+    formatCount = 0;
-    sampleFlags.clear();
-    sampleStartOffsets.clear();
-    sampleEndOffsets.clear();
-    cryptoDatas.clear();
  }
  @Override
  public void format(Format format) {
-    // TODO: Capture and assert all formats (interleaved with the samples).
+    addFormat(format);
-    this.format = format;
  }
  @Override
@@ -101,80 +94,187 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
      int size,
      int offset,
      @Nullable CryptoData cryptoData) {
-    if (format == null) {
+    if (lastFormat == null) {
      throw new IllegalStateException("TrackOutput must receive format before sampleMetadata");
    }
-    if (format.maxInputSize != Format.NO_VALUE && size > format.maxInputSize) {
+    if (lastFormat.maxInputSize != Format.NO_VALUE && size > lastFormat.maxInputSize) {
      throw new IllegalStateException("Sample size exceeds Format.maxInputSize");
    }
-    sampleTimesUs.add(timeUs);
+    if (dumpables.isEmpty()) {
-    sampleFlags.add(flags);
+      addFormat(lastFormat);
-    sampleStartOffsets.add(sampleData.length - offset - size);
+    }
-    sampleEndOffsets.add(sampleData.length - offset);
+    addSampleInfo(
-    cryptoDatas.add(cryptoData);
+        timeUs, flags, sampleData.length - offset - size, sampleData.length - offset, cryptoData);
  }
  public void assertSampleCount(int count) {
-    assertThat(sampleTimesUs).hasSize(count);
+    assertThat(sampleInfos).hasSize(count);
  }
  public void assertSample(
      int index, byte[] data, long timeUs, int flags, @Nullable CryptoData cryptoData) {
    byte[] actualData = getSampleData(index);
    assertThat(actualData).isEqualTo(data);
-    assertThat(sampleTimesUs.get(index)).isEqualTo(timeUs);
+    assertThat(getSampleTimeUs(index)).isEqualTo(timeUs);
-    assertThat(sampleFlags.get(index)).isEqualTo(flags);
+    assertThat(getSampleFlags(index)).isEqualTo(flags);
-    assertThat(cryptoDatas.get(index)).isEqualTo(cryptoData);
+    assertThat(getSampleCryptoData(index)).isEqualTo(cryptoData);
  }
  public byte[] getSampleData(int index) {
-    return Arrays.copyOfRange(sampleData, sampleStartOffsets.get(index),
+    return Arrays.copyOfRange(sampleData, getSampleStartOffset(index), getSampleEndOffset(index));
-        sampleEndOffsets.get(index));
+  }
+  private byte[] getSampleData(int fromIndex, int toIndex) {
+    return Arrays.copyOfRange(sampleData, fromIndex, toIndex);
  }
  public long getSampleTimeUs(int index) {
-    return sampleTimesUs.get(index);
+    return sampleInfos.get(index).timeUs;
  }
  public int getSampleFlags(int index) {
-    return sampleFlags.get(index);
+    return sampleInfos.get(index).flags;
  }
  @Nullable
  public CryptoData getSampleCryptoData(int index) {
-    return cryptoDatas.get(index);
+    return sampleInfos.get(index).cryptoData;
  }
  public int getSampleCount() {
-    return sampleTimesUs.size();
+    return sampleInfos.size();
  }
  public List<Long> getSampleTimesUs() {
+    List<Long> sampleTimesUs = new ArrayList<>();
+    for (DumpableSampleInfo sampleInfo : sampleInfos) {
+      sampleTimesUs.add(sampleInfo.timeUs);
+    }
    return Collections.unmodifiableList(sampleTimesUs);
  }
  public void assertEquals(FakeTrackOutput expected) {
-    assertThat(format).isEqualTo(expected.format);
+    assertThat(lastFormat).isEqualTo(expected.lastFormat);
-    assertThat(sampleTimesUs).hasSize(expected.sampleTimesUs.size());
    assertThat(sampleData).isEqualTo(expected.sampleData);
-    for (int i = 0; i < sampleTimesUs.size(); i++) {
+    assertThat(dumpables).hasSize(expected.dumpables.size());
-      assertThat(sampleTimesUs.get(i)).isEqualTo(expected.sampleTimesUs.get(i));
+    for (int i = 0; i < dumpables.size(); i++) {
-      assertThat(sampleFlags.get(i)).isEqualTo(expected.sampleFlags.get(i));
+      assertThat(dumpables.get(i)).isEqualTo(expected.dumpables.get(i));
-      assertThat(sampleStartOffsets.get(i)).isEqualTo(expected.sampleStartOffsets.get(i));
-      assertThat(sampleEndOffsets.get(i)).isEqualTo(expected.sampleEndOffsets.get(i));
-      if (expected.cryptoDatas.get(i) == null) {
-        assertThat(cryptoDatas.get(i)).isNull();
-      } else {
-        assertThat(cryptoDatas.get(i)).isEqualTo(expected.cryptoDatas.get(i));
-      }
    }
  }
  @Override
  public void dump(Dumper dumper) {
-    if (format != null) {
+    dumper.add("total output bytes", sampleData.length);
+    dumper.add("sample count", sampleInfos.size());
+    if (dumpables.isEmpty() && lastFormat != null) {
+      new DumpableFormat(lastFormat, 0).dump(dumper);
+    }
+    for (int i = 0; i < dumpables.size(); i++) {
+      dumpables.get(i).dump(dumper);
+    }
+  }
+  private int getSampleStartOffset(int index) {
+    return sampleInfos.get(index).startOffset;
+  }
+  private int getSampleEndOffset(int index) {
+    return sampleInfos.get(index).endOffset;
+  }
+  private void addFormat(Format format) {
+    lastFormat = format;
+    dumpables.add(new DumpableFormat(format, formatCount));
+    formatCount++;
+  }
+  private void addSampleInfo(
+      long timeUs, int flags, int startOffset, int endOffset, @Nullable CryptoData cryptoData) {
+    DumpableSampleInfo sampleInfo =
+        new DumpableSampleInfo(timeUs, flags, startOffset, endOffset, cryptoData, getSampleCount());
+    sampleInfos.add(sampleInfo);
+    dumpables.add(sampleInfo);
+  }
+  private final class DumpableSampleInfo implements Dumper.Dumpable {
+    public final long timeUs;
+    public final int flags;
+    public final int startOffset;
+    public final int endOffset;
+    @Nullable public final CryptoData cryptoData;
+    public final int index;
+    public DumpableSampleInfo(
+        long timeUs,
+        int flags,
+        int startOffset,
+        int endOffset,
+        @Nullable CryptoData cryptoData,
+        int index) {
+      this.timeUs = timeUs;
+      this.flags = flags;
+      this.startOffset = startOffset;
+      this.endOffset = endOffset;
+      this.cryptoData = cryptoData;
+      this.index = index;
+    }
+    @Override
+    public void dump(Dumper dumper) {
      dumper
-          .startBlock("format")
+          .startBlock("sample " + index)
+          .add("time", timeUs)
+          .add("flags", flags)
+          .add("data", getSampleData(startOffset, endOffset));
+      if (cryptoData != null) {
+        dumper.add("crypto mode", cryptoData.cryptoMode);
+        dumper.add("encryption key", cryptoData.encryptionKey);
+      }
+      dumper.endBlock();
+    }
+    @Override
+    public boolean equals(@Nullable Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      DumpableSampleInfo that = (DumpableSampleInfo) o;
+      return timeUs == that.timeUs
+          && flags == that.flags
+          && startOffset == that.startOffset
+          && endOffset == that.endOffset
+          && index == that.index
+          && Util.areEqual(cryptoData, that.cryptoData);
+    }
+    @Override
+    public int hashCode() {
+      int result = (int) timeUs;
+      result = 31 * result + flags;
+      result = 31 * result + startOffset;
+      result = 31 * result + endOffset;
+      result = 31 * result + (cryptoData == null ? 0 : cryptoData.hashCode());
+      result = 31 * result + index;
+      return result;
+    }
+  }
+  private static final class DumpableFormat implements Dumper.Dumpable {
+    private final Format format;
+    public final int index;
+    public DumpableFormat(Format format, int index) {
+      this.format = format;
+      this.index = index;
+    }
+    @Override
+    public void dump(Dumper dumper) {
+      dumper
+          .startBlock("format " + index)
          .add("bitrate", format.bitrate)
          .add("id", format.id)
          .add("containerMimeType", format.containerMimeType)
@@ -203,21 +303,23 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
      dumper.endBlock().endBlock();
    }
-    dumper.add("total output bytes", sampleData.length);
+    @Override
-    dumper.add("sample count", sampleTimesUs.size());
+    public boolean equals(@Nullable Object o) {
+      if (this == o) {
-    for (int i = 0; i < sampleTimesUs.size(); i++) {
+        return true;
-      dumper.startBlock("sample " + i)
-          .add("time", sampleTimesUs.get(i))
-          .add("flags", sampleFlags.get(i))
-          .add("data", getSampleData(i));
-      CryptoData cryptoData = cryptoDatas.get(i);
-      if (cryptoData != null) {
-        dumper.add("crypto mode", cryptoData.cryptoMode);
-        dumper.add("encryption key", cryptoData.encryptionKey);
      }
-      dumper.endBlock();
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      DumpableFormat that = (DumpableFormat) o;
+      return index == that.index && format.equals(that.format);
    }
-  }
+    @Override
+    public int hashCode() {
+      int result = format.hashCode();
+      result = 31 * result + index;
+      return result;
+    }
+  }
 }