Extractor tests: Output average and peak bitrates separately

Note: The dump files will need updating again when the extractors are modified to only set the appropriate bitrate. Enhancing the test first is nice, because it means that in subsequent CLs the dump file updates can be used to quickly see what's changed in the output. PiperOrigin-RevId: 297188367

Extractor tests: Output average and peak bitrates separately
Note: The dump files will need updating again when the extractors are modified to only set the appropriate bitrate. Enhancing the test first is nice, because it means that in subsequent CLs the dump file updates can be used to quickly see what's changed in the output. PiperOrigin-RevId: 297188367
31f03025 · olly · kim-vde · 46ebaff9 · 31f03025 · 31f03025
Commit 31f03025 authored Feb 25, 2020 by olly Committed by kim-vde Feb 27, 2020
Showing with 214 additions and 98 deletions
library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecVideoRendererTest.java
library/core/src/test/resources/com/google/android/exoplayer2/mediacodec/robolectric.properties
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
--- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecVideoRendererTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecVideoRendererTest.java
--- a/library/core/src/test/resources/com/google/android/exoplayer2/mediacodec/robolectric.properties
+++ b/library/core/src/test/resources/com/google/android/exoplayer2/mediacodec/robolectric.properties
+#
+# Copyright (C) 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file needs removing once Robolectric release a version > 4.3.1.
+# [Internal ref: b/147731297]
+shadows=com.google.android.exoplayer2.mediacodec.ShadowMediaCodec
--- a/testdata/src/test/assets/amr/sample_nb.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_nb.amr.0.dump
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 2834
  sample count = 218
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/3gpp

--- a/testdata/src/test/assets/amr/sample_nb.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_nb.amr.unklen.dump
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 2834
  sample count = 218
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/3gpp

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 2834
  sample count = 218
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/3gpp

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 1898
  sample count = 146
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/3gpp

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 949
  sample count = 73
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/3gpp

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 13
  sample count = 1
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/3gpp

--- a/testdata/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 2834
  sample count = 218
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/3gpp

--- a/testdata/src/test/assets/amr/sample_wb.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_wb.amr.0.dump
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 4056
  sample count = 169
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/amr-wb

--- a/testdata/src/test/assets/amr/sample_wb.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_wb.amr.unklen.dump
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 4056
  sample count = 169
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/amr-wb

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 4056
  sample count = 169
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/amr-wb

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 2712
  sample count = 113
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/amr-wb

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 1368
  sample count = 57
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/amr-wb

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 24
  sample count = 1
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/amr-wb

--- a/testdata/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
+++ b/testdata/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 4056
  sample count = 169
  format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
    id = null
    containerMimeType = null
    sampleMimeType = audio/amr-wb

--- a/testdata/src/test/assets/flac/bear_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_java.0.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_java.1.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_java.2.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_java.3.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_java.unklen.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_native.0.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_native.1.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 362432
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_native.2.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 182208
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_native.3.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 18368
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_native.unklen.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 362432
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 182208
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 18368
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -8,7 +8,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -8,7 +8,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -8,7 +8,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -8,7 +8,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 445
  sample count = 1
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 362432
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 182208
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 1984
  sample count = 1
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -7,7 +7,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 144086
  sample count = 27
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 100240
  sample count = 19
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 48500
  sample count = 10
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 3385
  sample count = 2
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 144086
  sample count = 27
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 482416
  sample count = 27
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 334960
  sample count = 19
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 169072
  sample count = 10
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 21616
  sample count = 2
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 482416
  sample count = 27
  format 0:
-    bitrate = 1408000
+    averageBitrate = 1408000
+    peakBitrate = 1408000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 362432
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 182208
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 18368
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 362432
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 182208
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 18368
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_with_picture_java.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.0.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_with_picture_java.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.1.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_with_picture_java.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.2.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_with_picture_java.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.3.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_with_picture_java.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_java.unklen.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- a/testdata/src/test/assets/flac/bear_with_picture_native.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.0.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_with_picture_native.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.1.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 362432
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_with_picture_native.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.2.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 182208
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_with_picture_native.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.3.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 18368
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- a/testdata/src/test/assets/flac/bear_with_picture_native.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_native.unklen.dump
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/flac

--- 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
@@ -10,7 +10,8 @@ track 0:
  total output bytes = 526272
  sample count = 33
  format 0:
-    bitrate = 1536000
+    averageBitrate = 1536000
+    peakBitrate = 1536000
    id = null
    containerMimeType = null
    sampleMimeType = audio/raw

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