Don't set decoded bitrate on audio/flac format

PiperOrigin-RevId: 297864386

Don't set decoded bitrate on audio/flac format
PiperOrigin-RevId: 297864386
3730639c · olly · Oliver Woodman · 1ca9a061 · 3730639c · 3730639c
Commit 3730639c authored Feb 28, 2020 by olly Committed by Oliver Woodman Feb 28, 2020
Showing with 28 additions and 128 deletions
extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
library/common/src/main/java/com/google/android/exoplayer2/Format.java
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java
testdata/src/test/assets/flac/bear_flac.0.dump
testdata/src/test/assets/flac/bear_flac.1.dump
testdata/src/test/assets/flac/bear_flac.2.dump
testdata/src/test/assets/flac/bear_flac.3.dump
testdata/src/test/assets/flac/bear_flac.unklen.dump
testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.0.dump
testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.1.dump
testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.2.dump
testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.3.dump
testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.unklen.dump
testdata/src/test/assets/flac/bear_no_num_samples_flac.0.dump
testdata/src/test/assets/flac/bear_no_num_samples_flac.unklen.dump
testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.0.dump
testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.unklen.dump
testdata/src/test/assets/flac/bear_one_metadata_block_flac.0.dump
testdata/src/test/assets/flac/bear_one_metadata_block_flac.1.dump
testdata/src/test/assets/flac/bear_one_metadata_block_flac.2.dump
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
@@ -270,7 +270,7 @@ public final class FlacExtractor implements Extractor {
            /* id= */ null,
            MimeTypes.AUDIO_RAW,
            /* codecs= */ null,
-            streamMetadata.getBitRate(),
+            streamMetadata.getDecodedBitrate(),
            streamMetadata.getMaxDecodedFrameSize(),
            streamMetadata.channels,
            streamMetadata.sampleRate,

--- a/library/common/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/Format.java
@@ -644,34 +644,42 @@ public final class Format implements Parcelable {
  /** Track role flags. */
  @C.RoleFlags public final int roleFlags;
  /**
-   * The average bitrate in bits per second, or {@link #NO_VALUE} if unknown or not applicable. This
+   * The average bitrate in bits per second, or {@link #NO_VALUE} if unknown or not applicable. The
-   * field may be populated from the following sources, depending on media type and the type of the
+   * way in which this field is populated depends on the type of media to which the format
-   * track within the media:
+   * corresponds:
   *
   * <ul>
-   *   <li>DASH: Always {@link Format#NO_VALUE}.
+   *   <li>DASH representations: Always {@link Format#NO_VALUE}.
-   *   <li>HLS: The {@code AVERAGE-BANDWIDTH} attribute defined on the corresponding {@code
+   *   <li>HLS variants: The {@code AVERAGE-BANDWIDTH} attribute defined on the corresponding {@code
   *       EXT-X-STREAM-INF} tag in the master playlist, or {@link Format#NO_VALUE} if not present.
-   *   <li>SmoothStreaming: The {@code Bitrate} attribute defined on the corresponding {@code
+   *   <li>SmoothStreaming track elements: The {@code Bitrate} attribute defined on the
-   *       TrackElement} in the manifest, or {@link Format#NO_VALUE} if not present.
+   *       corresponding {@code TrackElement} in the manifest, or {@link Format#NO_VALUE} if not
+   *       present.
   *   <li>Progressive container formats: Often {@link Format#NO_VALUE}, but may be populated with
-   *       the average bitrate if defined by the container.
+   *       the average bitrate of the container if known.
+   *   <li>Sample formats: Often {@link Format#NO_VALUE}, but may be populated with the average
+   *       bitrate of the stream of samples with type {@link #sampleMimeType} if known. Note that if
+   *       {@link #sampleMimeType} is a compressed format (e.g., {@link MimeTypes#AUDIO_AAC}), then
+   *       this bitrate is for the stream of still compressed samples.
   * </ul>
   */
  public final int averageBitrate;
  /**
-   * The peak bitrate in bits per second, or {@link #NO_VALUE} if unknown or not applicable. This
+   * The peak bitrate in bits per second, or {@link #NO_VALUE} if unknown or not applicable. The way
-   * field may be populated from the following sources, depending on media type and the type of the
+   * in which this field is populated depends on the type of media to which the format corresponds:
-   * track within the media:
   *
   * <ul>
-   *   <li>DASH: The {@code @bandwidth} attribute of the corresponding {@code Representation}
+   *   <li>DASH representations: The {@code @bandwidth} attribute of the corresponding {@code
-   *       element in the manifest.
+   *       Representation} element in the manifest.
-   *   <li>HLS: The {@code BANDWIDTH} attribute defined on the corresponding {@code
+   *   <li>HLS variants: The {@code BANDWIDTH} attribute defined on the corresponding {@code
   *       EXT-X-STREAM-INF} tag.
-   *   <li>SmoothStreaming: Always {@link Format#NO_VALUE}.
+   *   <li>SmoothStreaming track elements: Always {@link Format#NO_VALUE}.
   *   <li>Progressive container formats: Often {@link Format#NO_VALUE}, but may be populated with
-   *       the peak bitrate if defined by the container.
+   *       the peak bitrate of the container if known.
+   *   <li>Sample formats: Often {@link Format#NO_VALUE}, but may be populated with the peak bitrate
+   *       of the stream of samples with type {@link #sampleMimeType} if known. Note that if {@link
+   *       #sampleMimeType} is a compressed format (e.g., {@link MimeTypes#AUDIO_AAC}), then this
+   *       bitrate is for the stream of still compressed samples.
   * </ul>
   */
  public final int peakBitrate;

--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java
@@ -182,8 +182,8 @@ public final class FlacStreamMetadata {
    return maxBlockSizeSamples * channels * (bitsPerSample / 8);
  }
-  /** Returns the bit-rate of the FLAC stream. */
+  /** Returns the bitrate of the stream after it's decoded into PCM. */
-  public int getBitRate() {
+  public int getDecodedBitrate() {
    return bitsPerSample * sampleRate * channels;
  }
@@ -244,7 +244,7 @@ public final class FlacStreamMetadata {
        /* id= */ null,
        MimeTypes.AUDIO_FLAC,
        /* codecs= */ null,
-        getBitRate(),
+        /* bitrate= */ Format.NO_VALUE,
        maxInputSize,
        channels,
        sampleRate,

--- a/testdata/src/test/assets/flac/bear_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_flac.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    channelCount = 2
    sampleRate = 48000

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    channelCount = 2
    sampleRate = 48000

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    channelCount = 2
    sampleRate = 48000

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    channelCount = 2
    sampleRate = 48000

--- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    channelCount = 2
    sampleRate = 48000

--- a/testdata/src/test/assets/flac/bear_no_num_samples_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_num_samples_flac.0.dump
@@ -8,8 +8,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_no_num_samples_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_num_samples_flac.unklen.dump
@@ -8,8 +8,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.0.dump
@@ -7,8 +7,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.unklen.dump
@@ -7,8 +7,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 445
  sample count = 1
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_one_metadata_block_flac.unklen.dump
@@ -7,8 +7,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 144086
  sample count = 27
  format 0:
-    averageBitrate = 1408000
-    peakBitrate = 1408000
    sampleMimeType = audio/flac
    maxInputSize = 6456
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 100240
  sample count = 19
  format 0:
-    averageBitrate = 1408000
-    peakBitrate = 1408000
    sampleMimeType = audio/flac
    maxInputSize = 6456
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 48500
  sample count = 10
  format 0:
-    averageBitrate = 1408000
-    peakBitrate = 1408000
    sampleMimeType = audio/flac
    maxInputSize = 6456
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 3385
  sample count = 2
  format 0:
-    averageBitrate = 1408000
-    peakBitrate = 1408000
    sampleMimeType = audio/flac
    maxInputSize = 6456
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 144086
  sample count = 27
  format 0:
-    averageBitrate = 1408000
-    peakBitrate = 1408000
    sampleMimeType = audio/flac
    maxInputSize = 6456
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_picture_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_picture_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_picture_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_picture_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_picture_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_picture_flac.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.0.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.1.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.2.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.3.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 3829
  sample count = 2
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.unklen.dump
+++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 445
  sample count = 1
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_flac.ogg.unklen.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 113666
  sample count = 23
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 55652
  sample count = 12
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
@@ -10,8 +10,6 @@ track 0:
  total output bytes = 445
  sample count = 1
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2

--- a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
+++ b/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
@@ -7,8 +7,6 @@ track 0:
  total output bytes = 164431
  sample count = 33
  format 0:
-    averageBitrate = 1536000
-    peakBitrate = 1536000
    sampleMimeType = audio/flac
    maxInputSize = 5776
    channelCount = 2