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

library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecVideoRendererTest.java

+/*
+ * 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.
+ */
+package com.google.android.exoplayer2.mediacodec;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.graphics.SurfaceTexture;
+import android.media.MediaCodec;
+import android.media.MediaFormat;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.view.Surface;
+import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
+import com.google.android.exoplayer2.testutil.FakeSampleStream;
+import com.google.android.exoplayer2.testutil.FakeSampleStream.FakeSampleStreamItem;
+import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
+import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
+import com.google.android.exoplayer2.video.VideoRendererEventListener;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+/** Unit test for {@link MediaCodecVideoRenderer}. */
+@ClosedSource(reason = "See b/147731297.")
+@RunWith(AndroidJUnit4.class)
+public class MediaCodecVideoRendererTest {
+  @Rule public final MockitoRule mockito = MockitoJUnit.rule();
+
+  private static final Format BASIC_MP4_1080 =
+      Format.createVideoSampleFormat(
+          /* id= */ null,
+          /* sampleMimeType= */ MimeTypes.VIDEO_MP4,
+          /* codecs= */ null,
+          /* bitrate= */ Format.NO_VALUE,
+          /* maxInputSize= */ Format.NO_VALUE,
+          /* width= */ 1920,
+          /* height= */ 1080,
+          /* frameRate= */ Format.NO_VALUE,
+          /* initializationData= */ null,
+          /* rotationDegrees= */ 0,
+          /* pixelWidthHeightRatio= */ 1f,
+          /* drmInitData= */ null);
+
+  private MediaCodecVideoRenderer mediaCodecVideoRenderer;
+  @Mock private VideoRendererEventListener eventListener;
+
+  @Before
+  public void setUp() throws Exception {
+    MediaCodecSelector mediaCodecSelector =
+        new MediaCodecSelector() {
+          @Override
+          public List<MediaCodecInfo> getDecoderInfos(
+              String mimeType, boolean requiresSecureDecoder, boolean requiresTunnelingDecoder) {
+            return Collections.singletonList(
+                MediaCodecInfo.newInstance(
+                    /* name= */ "name",
+                    /* mimeType= */ mimeType,
+                    /* codecMimeType= */ mimeType,
+                    /* capabilities= */ null,
+                    /* hardwareAccelerated= */ false,
+                    /* softwareOnly= */ true,
+                    /* vendor= */ false,
+                    /* forceDisableAdaptive= */ false,
+                    /* forceSecure= */ false));
+          }
+
+          @Override
+          @Nullable
+          public MediaCodecInfo getPassthroughDecoderInfo() throws DecoderQueryException {
+            throw new UnsupportedOperationException();
+          }
+        };
+
+    mediaCodecVideoRenderer =
+        new MediaCodecVideoRenderer(
+            ApplicationProvider.getApplicationContext(),
+            mediaCodecSelector,
+            /* allowedJoiningTimeMs= */ 0,
+            /* eventHandler= */ new Handler(),
+            /* eventListener= */ eventListener,
+            /* maxDroppedFramesToNotify= */ -1) {
+          @Override
+          @Capabilities
+          protected int supportsFormat(MediaCodecSelector mediaCodecSelector, Format format)
+              throws DecoderQueryException {
+            return RendererCapabilities.create(FORMAT_HANDLED);
+          }
+        };
+
+    mediaCodecVideoRenderer.handleMessage(
+        Renderer.MSG_SET_SURFACE, new Surface(new SurfaceTexture(/* texName= */ 0)));
+  }
+
+  @Test
+  public void render_sendsVideoSizeChangeWithCurrentFormatValues() throws Exception {
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {BASIC_MP4_1080},
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 0,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME),
+            FakeSampleStreamItem.END_OF_STREAM_ITEM),
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ true,
+        /* offsetUs */ 0);
+    mediaCodecVideoRenderer.setCurrentStreamFinal();
+    mediaCodecVideoRenderer.start();
+
+    int positionUs = 0;
+    do {
+      mediaCodecVideoRenderer.render(positionUs, SystemClock.elapsedRealtime() * 1000);
+      positionUs += 10;
+    } while (!mediaCodecVideoRenderer.isEnded());
+
+    verify(eventListener)
+        .onVideoSizeChanged(
+            BASIC_MP4_1080.width,
+            BASIC_MP4_1080.height,
+            BASIC_MP4_1080.rotationDegrees,
+            BASIC_MP4_1080.pixelWidthHeightRatio);
+  }
+
+  @Test
+  public void render_includingResetPosition_keepsOutputFormatInVideoFrameMetadataListener()
+      throws Exception {
+    AtomicReference<Format> lastRenderedFrameFormat = new AtomicReference<>();
+    VideoFrameMetadataListener frameMetadataListener =
+        new VideoFrameMetadataListener() {
+          @Override
+          public void onVideoFrameAboutToBeRendered(
+              long presentationTimeUs,
+              long releaseTimeNs,
+              Format format,
+              @Nullable MediaFormat mediaFormat) {
+            lastRenderedFrameFormat.set(format);
+          }
+        };
+    mediaCodecVideoRenderer.handleMessage(
+        Renderer.MSG_SET_VIDEO_FRAME_METADATA_LISTENER, frameMetadataListener);
+    FakeSampleStream fakeSampleStream =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME));
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {BASIC_MP4_1080},
+        fakeSampleStream,
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ true,
+        /* offsetUs */ 0);
+
+    mediaCodecVideoRenderer.start();
+    mediaCodecVideoRenderer.render(/* positionUs= */ 0, SystemClock.elapsedRealtime() * 1000);
+    mediaCodecVideoRenderer.resetPosition(0);
+    mediaCodecVideoRenderer.setCurrentStreamFinal();
+    fakeSampleStream.addFakeSampleStreamItem(
+        new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME));
+    fakeSampleStream.addFakeSampleStreamItem(FakeSampleStreamItem.END_OF_STREAM_ITEM);
+    int positionUs = 10;
+    do {
+      mediaCodecVideoRenderer.render(positionUs, SystemClock.elapsedRealtime() * 1000);
+      positionUs += 10;
+    } while (!mediaCodecVideoRenderer.isEnded());
+
+    assertThat(lastRenderedFrameFormat.get()).isEqualTo(BASIC_MP4_1080);
+  }
+
+  @Test
+  public void enable_withMayRenderStartOfStream_rendersFirstFrameBeforeStart() throws Exception {
+    FakeSampleStream fakeSampleStream =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME));
+
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {BASIC_MP4_1080},
+        fakeSampleStream,
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ true,
+        /* offsetUs */ 0);
+    for (int i = 0; i < 10; i++) {
+      mediaCodecVideoRenderer.render(/* positionUs= */ 0, SystemClock.elapsedRealtime() * 1000);
+    }
+
+    verify(eventListener).onRenderedFirstFrame(any());
+  }
+
+  @Test
+  public void enable_withoutMayRenderStartOfStream_doesNotRenderFirstFrameBeforeStart()
+      throws Exception {
+    FakeSampleStream fakeSampleStream =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME));
+
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {BASIC_MP4_1080},
+        fakeSampleStream,
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ false,
+        /* offsetUs */ 0);
+    for (int i = 0; i < 10; i++) {
+      mediaCodecVideoRenderer.render(/* positionUs= */ 0, SystemClock.elapsedRealtime() * 1000);
+    }
+
+    verify(eventListener, never()).onRenderedFirstFrame(any());
+  }
+
+  @Test
+  public void enable_withoutMayRenderStartOfStream_rendersFirstFrameAfterStart() throws Exception {
+    FakeSampleStream fakeSampleStream =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME));
+
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {BASIC_MP4_1080},
+        fakeSampleStream,
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ false,
+        /* offsetUs */ 0);
+    mediaCodecVideoRenderer.start();
+    for (int i = 0; i < 10; i++) {
+      mediaCodecVideoRenderer.render(/* positionUs= */ 0, SystemClock.elapsedRealtime() * 1000);
+    }
+
+    verify(eventListener).onRenderedFirstFrame(any());
+  }
+
+  @Test
+  public void replaceStream_whenStarted_rendersFirstFrameOfNewStream() throws Exception {
+    FakeSampleStream fakeSampleStream1 =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME),
+            FakeSampleStreamItem.END_OF_STREAM_ITEM);
+    FakeSampleStream fakeSampleStream2 =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME),
+            FakeSampleStreamItem.END_OF_STREAM_ITEM);
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {BASIC_MP4_1080},
+        fakeSampleStream1,
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ true,
+        /* offsetUs */ 0);
+    mediaCodecVideoRenderer.start();
+
+    boolean replacedStream = false;
+    for (int i = 0; i < 200; i += 10) {
+      mediaCodecVideoRenderer.render(
+          /* positionUs= */ i * 10, SystemClock.elapsedRealtime() * 1000);
+      if (!replacedStream && mediaCodecVideoRenderer.hasReadStreamToEnd()) {
+        mediaCodecVideoRenderer.replaceStream(
+            new Format[] {BASIC_MP4_1080}, fakeSampleStream2, /* offsetUs= */ 100);
+        replacedStream = true;
+      }
+    }
+
+    verify(eventListener, times(2)).onRenderedFirstFrame(any());
+  }
+
+  // TODO: Fix this by not rendering the first frame of a new stream unless started.
+  @Ignore
+  @Test
+  public void replaceStream_whenNotStarted_doesNotRenderFirstFrameOfNewStream() throws Exception {
+    FakeSampleStream fakeSampleStream1 =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME),
+            FakeSampleStreamItem.END_OF_STREAM_ITEM);
+    FakeSampleStream fakeSampleStream2 =
+        new FakeSampleStream(
+            /* format= */ BASIC_MP4_1080,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(new byte[] {0}, C.BUFFER_FLAG_KEY_FRAME),
+            FakeSampleStreamItem.END_OF_STREAM_ITEM);
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {BASIC_MP4_1080},
+        fakeSampleStream1,
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ true,
+        /* offsetUs */ 0);
+
+    boolean replacedStream = false;
+    for (int i = 0; i < 200; i += 10) {
+      mediaCodecVideoRenderer.render(
+          /* positionUs= */ i * 10, SystemClock.elapsedRealtime() * 1000);
+      if (!replacedStream && mediaCodecVideoRenderer.hasReadStreamToEnd()) {
+        mediaCodecVideoRenderer.replaceStream(
+            new Format[] {BASIC_MP4_1080}, fakeSampleStream2, /* offsetUs= */ 100);
+        replacedStream = true;
+      }
+    }
+
+    verify(eventListener).onRenderedFirstFrame(any());
+  }
+
+  /**
+   * Tests that {@link VideoRendererEventListener#onVideoFrameProcessingOffset} is called for every
+   * output format change triggered from {@link MediaCodec}.
+   *
+   * <p>This test is needed to ensure that {@link MediaCodecRenderer#updateOutputFormatForTime}
+   * (which updates the value returned from {@link MediaCodecRenderer#getCurrentOutputFormat()} is
+   * called after {@link MediaCodecVideoRenderer} handles the {@link MediaCodec MediaCodec's }
+   * output format change.
+   */
+  @Test
+  public void onVideoFrameProcessingOffset_isCalledAfterOutputFormatChanges()
+      throws ExoPlaybackException {
+    Format mp4Uhd = BASIC_MP4_1080.buildUpon().setWidth(3840).setHeight(2160).build();
+    byte[] sampleData = new byte[0];
+    FakeSampleStream fakeSampleStream =
+        new FakeSampleStream(
+            /* format= */ mp4Uhd,
+            /* eventDispatcher= */ null,
+            /* firstSampleTimeUs= */ 0,
+            /* timeUsIncrement= */ 50,
+            new FakeSampleStreamItem(mp4Uhd),
+            new FakeSampleStreamItem(sampleData, C.BUFFER_FLAG_KEY_FRAME),
+            new FakeSampleStreamItem(BASIC_MP4_1080),
+            new FakeSampleStreamItem(sampleData, C.BUFFER_FLAG_KEY_FRAME),
+            new FakeSampleStreamItem(sampleData, C.BUFFER_FLAG_KEY_FRAME),
+            new FakeSampleStreamItem(mp4Uhd),
+            new FakeSampleStreamItem(sampleData, C.BUFFER_FLAG_KEY_FRAME),
+            new FakeSampleStreamItem(sampleData, C.BUFFER_FLAG_KEY_FRAME),
+            new FakeSampleStreamItem(sampleData, C.BUFFER_FLAG_KEY_FRAME),
+            new FakeSampleStreamItem(BASIC_MP4_1080),
+            new FakeSampleStreamItem(sampleData, C.BUFFER_FLAG_KEY_FRAME),
+            FakeSampleStreamItem.END_OF_STREAM_ITEM);
+
+    mediaCodecVideoRenderer.enable(
+        RendererConfiguration.DEFAULT,
+        new Format[] {mp4Uhd},
+        fakeSampleStream,
+        /* positionUs= */ 0,
+        /* joining= */ false,
+        /* mayRenderStartOfStream= */ true,
+        /* offsetUs */ 0);
+
+    mediaCodecVideoRenderer.setCurrentStreamFinal();
+    mediaCodecVideoRenderer.start();
+
+    int positionUs = 10;
+    do {
+      mediaCodecVideoRenderer.render(positionUs, SystemClock.elapsedRealtime() * 1000);
+      positionUs += 10;
+    } while (!mediaCodecVideoRenderer.isEnded());
+    mediaCodecVideoRenderer.stop();
+
+    InOrder orderVerifier = inOrder(eventListener);
+    orderVerifier.verify(eventListener).onVideoFrameProcessingOffset(anyLong(), eq(1), eq(mp4Uhd));
+    orderVerifier
+        .verify(eventListener)
+        .onVideoFrameProcessingOffset(anyLong(), eq(2), eq(BASIC_MP4_1080));
+    orderVerifier.verify(eventListener).onVideoFrameProcessingOffset(anyLong(), eq(3), eq(mp4Uhd));
+    orderVerifier
+        .verify(eventListener)
+        .onVideoFrameProcessingOffset(anyLong(), eq(1), eq(BASIC_MP4_1080));
+    orderVerifier.verifyNoMoreInteractions();
+  }
+}

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

testdata/src/test/assets/amr/sample_nb.amr.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 2834
   total output bytes = 2834
   sample count = 218
   sample count = 218
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/3gpp
     sampleMimeType = audio/3gpp

testdata/src/test/assets/amr/sample_nb.amr.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 2834
   total output bytes = 2834
   sample count = 218
   sample count = 218
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/3gpp
     sampleMimeType = audio/3gpp

testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 2834
   total output bytes = 2834
   sample count = 218
   sample count = 218
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/3gpp
     sampleMimeType = audio/3gpp

testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 1898
   total output bytes = 1898
   sample count = 146
   sample count = 146
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/3gpp
     sampleMimeType = audio/3gpp

testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 949
   total output bytes = 949
   sample count = 73
   sample count = 73
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/3gpp
     sampleMimeType = audio/3gpp

testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 13
   total output bytes = 13
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/3gpp
     sampleMimeType = audio/3gpp

testdata/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 2834
   total output bytes = 2834
   sample count = 218
   sample count = 218
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/3gpp
     sampleMimeType = audio/3gpp

testdata/src/test/assets/amr/sample_wb.amr.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 4056
   total output bytes = 4056
   sample count = 169
   sample count = 169
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb

testdata/src/test/assets/amr/sample_wb.amr.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 4056
   total output bytes = 4056
   sample count = 169
   sample count = 169
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb

testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 4056
   total output bytes = 4056
   sample count = 169
   sample count = 169
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb

testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 2712
   total output bytes = 2712
   sample count = 113
   sample count = 113
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb

testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 1368
   total output bytes = 1368
   sample count = 57
   sample count = 57
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb

testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 24
   total output bytes = 24
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb

testdata/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 4056
   total output bytes = 4056
   sample count = 169
   sample count = 169
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb

testdata/src/test/assets/flac/bear_java.0.dump

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

testdata/src/test/assets/flac/bear_java.1.dump

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

testdata/src/test/assets/flac/bear_java.2.dump

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

testdata/src/test/assets/flac/bear_java.3.dump

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

testdata/src/test/assets/flac/bear_java.unklen.dump

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

testdata/src/test/assets/flac/bear_native.0.dump

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

testdata/src/test/assets/flac/bear_native.1.dump

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

testdata/src/test/assets/flac/bear_native.2.dump

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

testdata/src/test/assets/flac/bear_native.3.dump

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

testdata/src/test/assets/flac/bear_native.unklen.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.0.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.1.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.2.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.3.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_java.unklen.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.0.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.1.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.2.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.3.dump

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

testdata/src/test/assets/flac/bear_no_min_max_frame_size_native.unklen.dump

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

testdata/src/test/assets/flac/bear_no_num_samples_java.0.dump

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

testdata/src/test/assets/flac/bear_no_num_samples_java.unklen.dump

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

testdata/src/test/assets/flac/bear_no_num_samples_native.0.dump

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

testdata/src/test/assets/flac/bear_no_num_samples_native.unklen.dump

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

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

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

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

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

testdata/src/test/assets/flac/bear_one_metadata_block_java.0.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_java.1.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_java.2.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_java.3.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_java.unklen.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_native.0.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_native.1.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_native.2.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_native.3.dump

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

testdata/src/test/assets/flac/bear_one_metadata_block_native.unklen.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.0.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.1.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.2.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.3.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_java.unklen.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.0.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.1.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.2.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.3.dump

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

testdata/src/test/assets/flac/bear_uncommon_sample_rate_native.unklen.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_java.0.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_java.1.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_java.2.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_java.3.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_java.unklen.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_native.0.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_native.1.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_native.2.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_native.3.dump

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

testdata/src/test/assets/flac/bear_with_id3_disabled_native.unklen.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_java.0.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_java.1.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_java.2.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_java.3.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_java.unklen.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_native.0.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_native.1.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_native.2.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_native.3.dump

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

testdata/src/test/assets/flac/bear_with_id3_enabled_native.unklen.dump

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

testdata/src/test/assets/flac/bear_with_picture_java.0.dump

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

testdata/src/test/assets/flac/bear_with_picture_java.1.dump

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

testdata/src/test/assets/flac/bear_with_picture_java.2.dump

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

testdata/src/test/assets/flac/bear_with_picture_java.3.dump

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

testdata/src/test/assets/flac/bear_with_picture_java.unklen.dump

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

testdata/src/test/assets/flac/bear_with_picture_native.0.dump

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

testdata/src/test/assets/flac/bear_with_picture_native.1.dump

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

testdata/src/test/assets/flac/bear_with_picture_native.2.dump

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

testdata/src/test/assets/flac/bear_with_picture_native.3.dump

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

testdata/src/test/assets/flac/bear_with_picture_native.unklen.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_java.0.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_java.1.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_java.2.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_java.3.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_java.unklen.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_native.0.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_native.1.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_native.2.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_native.3.dump

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

testdata/src/test/assets/flac/bear_with_vorbis_comments_native.unklen.dump

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

testdata/src/test/assets/flv/sample.flv.0.dump

@@ -7,7 +7,8 @@ track 8:
   total output bytes = 9529
   total output bytes = 9529
   sample count = 45
   sample count = 45
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -213,7 +214,8 @@ track 9:
   total output bytes = 89502
   total output bytes = 89502
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc

testdata/src/test/assets/flv/sample.flv.unklen.dump

@@ -7,7 +7,8 @@ track 8:
   total output bytes = 9529
   total output bytes = 9529
   sample count = 45
   sample count = 45
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -213,7 +214,8 @@ track 9:
   total output bytes = 89502
   total output bytes = 89502
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc

testdata/src/test/assets/mkv/full_blocks.mkv.0.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 213
   total output bytes = 213
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-subrip
     sampleMimeType = application/x-subrip

testdata/src/test/assets/mkv/full_blocks.mkv.1.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 213
   total output bytes = 213
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-subrip
     sampleMimeType = application/x-subrip

testdata/src/test/assets/mkv/full_blocks.mkv.2.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 213
   total output bytes = 213
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-subrip
     sampleMimeType = application/x-subrip

testdata/src/test/assets/mkv/full_blocks.mkv.3.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 213
   total output bytes = 213
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-subrip
     sampleMimeType = application/x-subrip

testdata/src/test/assets/mkv/full_blocks.mkv.unklen.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 213
   total output bytes = 213
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-subrip
     sampleMimeType = application/x-subrip

testdata/src/test/assets/mkv/sample.mkv.0.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 89502
   total output bytes = 89502
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 2:
   total output bytes = 12120
   total output bytes = 12120
   sample count = 29
   sample count = 29
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac3
     sampleMimeType = audio/ac3

testdata/src/test/assets/mkv/sample.mkv.1.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 29422
   total output bytes = 29422
   sample count = 20
   sample count = 20
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -117,7 +118,8 @@ track 2:
   total output bytes = 8778
   total output bytes = 8778
   sample count = 21
   sample count = 21
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac3
     sampleMimeType = audio/ac3

testdata/src/test/assets/mkv/sample.mkv.2.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 8360
   total output bytes = 8360
   sample count = 9
   sample count = 9
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -73,7 +74,8 @@ track 2:
   total output bytes = 4180
   total output bytes = 4180
   sample count = 10
   sample count = 10
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac3
     sampleMimeType = audio/ac3

testdata/src/test/assets/mkv/sample.mkv.3.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -37,7 +38,8 @@ track 2:
   total output bytes = 1254
   total output bytes = 1254
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac3
     sampleMimeType = audio/ac3

testdata/src/test/assets/mkv/sample.mkv.unklen.dump

@@ -10,7 +10,8 @@ track 1:
   total output bytes = 89502
   total output bytes = 89502
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 2:
   total output bytes = 12120
   total output bytes = 12120
   sample count = 29
   sample count = 29
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac3
     sampleMimeType = audio/ac3

testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump

@@ -7,7 +7,8 @@ track 1:
   total output bytes = 39
   total output bytes = 39
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/x-vnd.on2.vp9
     sampleMimeType = video/x-vnd.on2.vp9

testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.unklen.dump

@@ -7,7 +7,8 @@ track 1:
   total output bytes = 39
   total output bytes = 39
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/x-vnd.on2.vp9
     sampleMimeType = video/x-vnd.on2.vp9

testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump

@@ -7,7 +7,8 @@ track 1:
   total output bytes = 24
   total output bytes = 24
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/x-vnd.on2.vp9
     sampleMimeType = video/x-vnd.on2.vp9

testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.unklen.dump

@@ -7,7 +7,8 @@ track 1:
   total output bytes = 24
   total output bytes = 24
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/x-vnd.on2.vp9
     sampleMimeType = video/x-vnd.on2.vp9

testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 45139
   total output bytes = 45139
   sample count = 108
   sample count = 108
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 30093
   total output bytes = 30093
   sample count = 72
   sample count = 72
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 15046
   total output bytes = 15046
   sample count = 36
   sample count = 36
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 45139
   total output bytes = 45139
   sample count = 108
   sample count = 108
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 38160
   total output bytes = 38160
   sample count = 117
   sample count = 117
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 25920
   total output bytes = 25920
   sample count = 82
   sample count = 82
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 12624
   total output bytes = 12624
   sample count = 42
   sample count = 42
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 216
   total output bytes = 216
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 38160
   total output bytes = 38160
   sample count = 117
   sample count = 117
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 38160
   total output bytes = 38160
   sample count = 117
   sample count = 117
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 24384
   total output bytes = 24384
   sample count = 77
   sample count = 77
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 11328
   total output bytes = 11328
   sample count = 38
   sample count = 38
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 38160
   total output bytes = 38160
   sample count = 117
   sample count = 117
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/play-trimmed.mp3.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 418
   total output bytes = 418
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/play-trimmed.mp3.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 418
   total output bytes = 418
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/play-trimmed.mp3.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 418
   total output bytes = 418
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/play-trimmed.mp3.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 418
   total output bytes = 418
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp3/play-trimmed.mp3.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 418
   total output bytes = 418
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg
     sampleMimeType = audio/mpeg

testdata/src/test/assets/mp4/sample.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 9529
   total output bytes = 9529
   sample count = 45
   sample count = 45
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 7464
   total output bytes = 7464
   sample count = 33
   sample count = 33
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 4019
   total output bytes = 4019
   sample count = 18
   sample count = 18
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 470
   total output bytes = 470
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 9529
   total output bytes = 9529
   sample count = 45
   sample count = 45
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_ac4.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7613
   total output bytes = 7613
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7613
   total output bytes = 7613
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7613
   total output bytes = 7613
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7613
   total output bytes = 7613
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7613
   total output bytes = 7613
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7613
   total output bytes = 7613
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 5411
   total output bytes = 5411
   sample count = 13
   sample count = 13
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 3081
   total output bytes = 3081
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 393
   total output bytes = 393
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7613
   total output bytes = 7613
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7936
   total output bytes = 7936
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 5632
   total output bytes = 5632
   sample count = 13
   sample count = 13
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 3200
   total output bytes = 3200
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 410
   total output bytes = 410
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_ac4_protected.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 7936
   total output bytes = 7936
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 42320
   total output bytes = 42320
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc

testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 42320
   total output bytes = 42320
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc

testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 42320
   total output bytes = 42320
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc

testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 42320
   total output bytes = 42320
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc

testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 42320
   total output bytes = 42320
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc

testdata/src/test/assets/mp4/sample_eac3.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 216000
   total output bytes = 216000
   sample count = 54
   sample count = 54
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 144000
   total output bytes = 144000
   sample count = 36
   sample count = 36
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 72000
   total output bytes = 72000
   sample count = 18
   sample count = 18
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 4000
   total output bytes = 4000
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 216000
   total output bytes = 216000
   sample count = 54
   sample count = 54
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 216000
   total output bytes = 216000
   sample count = 54
   sample count = 54
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 148000
   total output bytes = 148000
   sample count = 37
   sample count = 37
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 76000
   total output bytes = 76000
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 4000
   total output bytes = 4000
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 216000
   total output bytes = 216000
   sample count = 54
   sample count = 54
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -154,7 +155,8 @@ track 1:
   total output bytes = 18257
   total output bytes = 18257
   sample count = 46
   sample count = 46
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -154,7 +155,8 @@ track 1:
   total output bytes = 18257
   total output bytes = 18257
   sample count = 46
   sample count = 46
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 18257
   total output bytes = 18257
   sample count = 46
   sample count = 46
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 13359
   total output bytes = 13359
   sample count = 31
   sample count = 31
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 6804
   total output bytes = 6804
   sample count = 16
   sample count = 16
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 10
   total output bytes = 10
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 18257
   total output bytes = 18257
   sample count = 46
   sample count = 46
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -154,7 +155,8 @@ track 1:
   total output bytes = 18257
   total output bytes = 18257
   sample count = 46
   sample count = 46
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -364,7 +366,8 @@ track 3:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 85933
   total output bytes = 85933
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -154,7 +155,8 @@ track 1:
   total output bytes = 18257
   total output bytes = 18257
   sample count = 46
   sample count = 46
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -364,7 +366,8 @@ track 3:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 9529
   total output bytes = 9529
   sample count = 45
   sample count = 45
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 7464
   total output bytes = 7464
   sample count = 33
   sample count = 33
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 4019
   total output bytes = 4019
   sample count = 18
   sample count = 18
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 470
   total output bytes = 470
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89876
   total output bytes = 89876
   sample count = 30
   sample count = 30
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/avc
     sampleMimeType = video/avc
@@ -157,7 +158,8 @@ track 1:
   total output bytes = 9529
   total output bytes = 9529
   sample count = 45
   sample count = 45
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 2
     id = 2
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm

testdata/src/test/assets/ogg/bear.opus.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 25541
   total output bytes = 25541
   sample count = 275
   sample count = 275
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/opus
     sampleMimeType = audio/opus

testdata/src/test/assets/ogg/bear.opus.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 17031
   total output bytes = 17031
   sample count = 184
   sample count = 184
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/opus
     sampleMimeType = audio/opus

testdata/src/test/assets/ogg/bear.opus.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 8698
   total output bytes = 8698
   sample count = 92
   sample count = 92
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/opus
     sampleMimeType = audio/opus

testdata/src/test/assets/ogg/bear.opus.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 126
   total output bytes = 126
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/opus
     sampleMimeType = audio/opus

testdata/src/test/assets/ogg/bear.opus.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 25541
   total output bytes = 25541
   sample count = 275
   sample count = 275
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/opus
     sampleMimeType = audio/opus

testdata/src/test/assets/ogg/bear_flac.ogg.0.dump

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

testdata/src/test/assets/ogg/bear_flac.ogg.1.dump

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

testdata/src/test/assets/ogg/bear_flac.ogg.2.dump

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

testdata/src/test/assets/ogg/bear_flac.ogg.3.dump

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

testdata/src/test/assets/ogg/bear_flac.ogg.unklen.dump

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

testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump

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

testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump

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

testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump

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

testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump

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

testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump

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

testdata/src/test/assets/ogg/bear_vorbis.ogg.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 26873
   total output bytes = 26873
   sample count = 180
   sample count = 180
   format 0:
   format 0:
-    bitrate = 112000
+    averageBitrate = 112000
+    peakBitrate = 112000
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
     sampleMimeType = audio/vorbis

testdata/src/test/assets/ogg/bear_vorbis.ogg.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 17598
   total output bytes = 17598
   sample count = 109
   sample count = 109
   format 0:
   format 0:
-    bitrate = 112000
+    averageBitrate = 112000
+    peakBitrate = 112000
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
     sampleMimeType = audio/vorbis

testdata/src/test/assets/ogg/bear_vorbis.ogg.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 8658
   total output bytes = 8658
   sample count = 49
   sample count = 49
   format 0:
   format 0:
-    bitrate = 112000
+    averageBitrate = 112000
+    peakBitrate = 112000
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
     sampleMimeType = audio/vorbis

testdata/src/test/assets/ogg/bear_vorbis.ogg.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = 112000
+    averageBitrate = 112000
+    peakBitrate = 112000
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
     sampleMimeType = audio/vorbis

testdata/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 26873
   total output bytes = 26873
   sample count = 180
   sample count = 180
   format 0:
   format 0:
-    bitrate = 112000
+    averageBitrate = 112000
+    peakBitrate = 112000
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
     sampleMimeType = audio/vorbis

testdata/src/test/assets/rawcc/sample.rawcc.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 978
   total output bytes = 978
   sample count = 150
   sample count = 150
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/rawcc/sample.rawcc.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 978
   total output bytes = 978
   sample count = 150
   sample count = 150
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample.ac3.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 13281
   total output bytes = 13281
   sample count = 8
   sample count = 8
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac3
     sampleMimeType = audio/ac3

testdata/src/test/assets/ts/sample.ac3.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 13281
   total output bytes = 13281
   sample count = 8
   sample count = 8
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac3
     sampleMimeType = audio/ac3

testdata/src/test/assets/ts/sample.ac4.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 7594
   total output bytes = 7594
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/ts/sample.ac4.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 7594
   total output bytes = 7594
   sample count = 19
   sample count = 19
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/ac4
     sampleMimeType = audio/ac4

testdata/src/test/assets/ts/sample.adts.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 30797
   total output bytes = 30797
   sample count = 144
   sample count = 144
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -609,7 +610,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample.adts.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 30797
   total output bytes = 30797
   sample count = 144
   sample count = 144
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -609,7 +610,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample.eac3.0.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 216000
   total output bytes = 216000
   sample count = 54
   sample count = 54
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/ts/sample.eac3.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 216000
   total output bytes = 216000
   sample count = 54
   sample count = 54
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/eac3
     sampleMimeType = audio/eac3

testdata/src/test/assets/ts/sample.ps.0.dump

@@ -10,7 +10,8 @@ track 192:
   total output bytes = 1671
   total output bytes = 1671
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 192
     id = 192
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -51,7 +52,8 @@ track 224:
   total output bytes = 44056
   total output bytes = 44056
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 224
     id = 224
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2

testdata/src/test/assets/ts/sample.ps.1.dump

@@ -10,7 +10,8 @@ track 192:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 192
     id = 192
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -35,7 +36,8 @@ track 224:
   total output bytes = 33949
   total output bytes = 33949
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 224
     id = 224
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2

testdata/src/test/assets/ts/sample.ps.2.dump

@@ -10,7 +10,8 @@ track 192:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 192
     id = 192
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -35,7 +36,8 @@ track 224:
   total output bytes = 19791
   total output bytes = 19791
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 224
     id = 224
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2

testdata/src/test/assets/ts/sample.ps.3.dump

@@ -10,7 +10,8 @@ track 192:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 192
     id = 192
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -35,7 +36,8 @@ track 224:
   total output bytes = 1585
   total output bytes = 1585
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 224
     id = 224
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2

testdata/src/test/assets/ts/sample.ps.unklen.dump

@@ -7,7 +7,8 @@ track 192:
   total output bytes = 1671
   total output bytes = 1671
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 192
     id = 192
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -48,7 +49,8 @@ track 224:
   total output bytes = 44056
   total output bytes = 44056
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 224
     id = 224
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2

testdata/src/test/assets/ts/sample.ts.0.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample.ts.1.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample.ts.2.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample.ts.3.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -36,7 +37,8 @@ track 257:
   total output bytes = 2508
   total output bytes = 2508
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -69,7 +71,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample.ts.unklen.dump

@@ -7,7 +7,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -41,7 +42,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -82,7 +84,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_cbs.adts.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 30797
   total output bytes = 30797
   sample count = 144
   sample count = 144
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -612,7 +613,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs.adts.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 20533
   total output bytes = 20533
   sample count = 94
   sample count = 94
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -412,7 +413,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs.adts.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 10161
   total output bytes = 10161
   sample count = 49
   sample count = 49
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -232,7 +233,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs.adts.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 174
   total output bytes = 174
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -40,7 +41,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 30797
   total output bytes = 30797
   sample count = 144
   sample count = 144
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -609,7 +610,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 30787
   total output bytes = 30787
   sample count = 143
   sample count = 143
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -608,7 +609,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 20523
   total output bytes = 20523
   sample count = 93
   sample count = 93
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -408,7 +409,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 10151
   total output bytes = 10151
   sample count = 48
   sample count = 48
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -228,7 +229,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 164
   total output bytes = 164
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -36,7 +37,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump

@@ -7,7 +7,8 @@ track 0:
   total output bytes = 30787
   total output bytes = 30787
   sample count = 143
   sample count = 143
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 0
     id = 0
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mp4a-latm
     sampleMimeType = audio/mp4a-latm
@@ -605,7 +606,8 @@ track 1:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1
     id = 1
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/id3
     sampleMimeType = application/id3

testdata/src/test/assets/ts/sample_scte35.ts.0.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 600:
   total output bytes = 105
   total output bytes = 105
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-scte35
     sampleMimeType = application/x-scte35
@@ -122,7 +125,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_scte35.ts.1.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 600:
   total output bytes = 105
   total output bytes = 105
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-scte35
     sampleMimeType = application/x-scte35
@@ -122,7 +125,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_scte35.ts.2.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 600:
   total output bytes = 105
   total output bytes = 105
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-scte35
     sampleMimeType = application/x-scte35
@@ -122,7 +125,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_scte35.ts.3.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -36,7 +37,8 @@ track 257:
   total output bytes = 2508
   total output bytes = 2508
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -69,7 +71,8 @@ track 600:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-scte35
     sampleMimeType = application/x-scte35
@@ -94,7 +97,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_scte35.ts.unklen.dump

@@ -7,7 +7,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -41,7 +42,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -82,7 +84,8 @@ track 600:
   total output bytes = 105
   total output bytes = 105
   sample count = 3
   sample count = 3
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/x-scte35
     sampleMimeType = application/x-scte35
@@ -119,7 +122,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_with_junk.0.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_with_junk.1.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_with_junk.2.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -44,7 +45,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -85,7 +87,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_with_junk.3.dump

@@ -10,7 +10,8 @@ track 256:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -36,7 +37,8 @@ track 257:
   total output bytes = 2508
   total output bytes = 2508
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -69,7 +71,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/ts/sample_with_junk.unklen.dump

@@ -7,7 +7,8 @@ track 256:
   total output bytes = 45026
   total output bytes = 45026
   sample count = 2
   sample count = 2
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/256
     id = 1/256
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = video/mpeg2
     sampleMimeType = video/mpeg2
@@ -41,7 +42,8 @@ track 257:
   total output bytes = 5015
   total output bytes = 5015
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/257
     id = 1/257
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/mpeg-L2
     sampleMimeType = audio/mpeg-L2
@@ -82,7 +84,8 @@ track 8448:
   total output bytes = 0
   total output bytes = 0
   sample count = 0
   sample count = 0
   format 0:
   format 0:
-    bitrate = -1
+    averageBitrate = -1
+    peakBitrate = -1
     id = 1/8448
     id = 1/8448
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = application/cea-608
     sampleMimeType = application/cea-608

testdata/src/test/assets/wav/sample.wav.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 88200
   total output bytes = 88200
   sample count = 10
   sample count = 10
   format 0:
   format 0:
-    bitrate = 705600
+    averageBitrate = 705600
+    peakBitrate = 705600
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample.wav.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 58802
   total output bytes = 58802
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = 705600
+    averageBitrate = 705600
+    peakBitrate = 705600
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample.wav.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 29402
   total output bytes = 29402
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = 705600
+    averageBitrate = 705600
+    peakBitrate = 705600
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample.wav.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 2
   total output bytes = 2
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = 705600
+    averageBitrate = 705600
+    peakBitrate = 705600
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample.wav.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 88200
   total output bytes = 88200
   sample count = 10
   sample count = 10
   format 0:
   format 0:
-    bitrate = 705600
+    averageBitrate = 705600
+    peakBitrate = 705600
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89804
   total output bytes = 89804
   sample count = 11
   sample count = 11
   format 0:
   format 0:
-    bitrate = 177004
+    averageBitrate = 177004
+    peakBitrate = 177004
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 61230
   total output bytes = 61230
   sample count = 7
   sample count = 7
   format 0:
   format 0:
-    bitrate = 177004
+    averageBitrate = 177004
+    peakBitrate = 177004
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 32656
   total output bytes = 32656
   sample count = 4
   sample count = 4
   format 0:
   format 0:
-    bitrate = 177004
+    averageBitrate = 177004
+    peakBitrate = 177004
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 4082
   total output bytes = 4082
   sample count = 1
   sample count = 1
   format 0:
   format 0:
-    bitrate = 177004
+    averageBitrate = 177004
+    peakBitrate = 177004
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testdata/src/test/assets/wav/sample_ima_adpcm.wav.unklen.dump

@@ -10,7 +10,8 @@ track 0:
   total output bytes = 89804
   total output bytes = 89804
   sample count = 11
   sample count = 11
   format 0:
   format 0:
-    bitrate = 177004
+    averageBitrate = 177004
+    peakBitrate = 177004
     id = null
     id = null
     containerMimeType = null
     containerMimeType = null
     sampleMimeType = audio/raw
     sampleMimeType = audio/raw

testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java

@@ -266,7 +266,8 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
     public void dump(Dumper dumper) {
     public void dump(Dumper dumper) {
       dumper
       dumper
           .startBlock("format " + index)
           .startBlock("format " + index)
-          .add("bitrate", format.bitrate)
+          .add("averageBitrate", format.averageBitrate)
+          .add("peakBitrate", format.peakBitrate)
           .add("id", format.id)
           .add("id", format.id)
           .add("containerMimeType", format.containerMimeType)
           .add("containerMimeType", format.containerMimeType)
           .add("sampleMimeType", format.sampleMimeType)
           .add("sampleMimeType", format.sampleMimeType)