From 32f7a8b807b46f4234621e41e53c20ec0322580f Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Wed, 23 Nov 2022 21:15:09 +0000
Subject: [PATCH] Rollback of
 https://github.com/androidx/media/commit/76df06a7a364c580dfe07d9f069237cd77c5174c

*** Original commit ***

Parse and set `peakBitrate` for Dolby TrueHD(AC-3) and (E-)AC-3

#minor-release

***

PiperOrigin-RevId: 490570517
(cherry picked from commit 427329175e87a7f3173791c59e6c2d4c4ed8dea4)
---
 .../main/java/androidx/media3/extractor/Ac3Util.java   | 10 +---------
 .../assets/extractordumps/mp4/sample_ac3.mp4.0.dump    |  2 --
 .../assets/extractordumps/mp4/sample_ac3.mp4.1.dump    |  2 --
 .../assets/extractordumps/mp4/sample_ac3.mp4.2.dump    |  2 --
 .../assets/extractordumps/mp4/sample_ac3.mp4.3.dump    |  2 --
 .../mp4/sample_ac3.mp4.unknown_length.dump             |  2 --
 .../mp4/sample_ac3_fragmented.mp4.0.dump               |  2 --
 .../mp4/sample_ac3_fragmented.mp4.1.dump               |  2 --
 .../mp4/sample_ac3_fragmented.mp4.2.dump               |  2 --
 .../mp4/sample_ac3_fragmented.mp4.3.dump               |  2 --
 .../mp4/sample_ac3_fragmented.mp4.unknown_length.dump  |  2 --
 .../assets/extractordumps/mp4/sample_eac3.mp4.0.dump   |  1 -
 .../assets/extractordumps/mp4/sample_eac3.mp4.1.dump   |  1 -
 .../assets/extractordumps/mp4/sample_eac3.mp4.2.dump   |  1 -
 .../assets/extractordumps/mp4/sample_eac3.mp4.3.dump   |  1 -
 .../mp4/sample_eac3.mp4.unknown_length.dump            |  1 -
 .../mp4/sample_eac3_fragmented.mp4.0.dump              |  1 -
 .../mp4/sample_eac3_fragmented.mp4.1.dump              |  1 -
 .../mp4/sample_eac3_fragmented.mp4.2.dump              |  1 -
 .../mp4/sample_eac3_fragmented.mp4.3.dump              |  1 -
 .../mp4/sample_eac3_fragmented.mp4.unknown_length.dump |  1 -
 .../extractordumps/mp4/sample_eac3joc.mp4.0.dump       |  1 -
 .../extractordumps/mp4/sample_eac3joc.mp4.1.dump       |  1 -
 .../extractordumps/mp4/sample_eac3joc.mp4.2.dump       |  1 -
 .../extractordumps/mp4/sample_eac3joc.mp4.3.dump       |  1 -
 .../mp4/sample_eac3joc.mp4.unknown_length.dump         |  1 -
 .../mp4/sample_eac3joc_fragmented.mp4.0.dump           |  1 -
 .../mp4/sample_eac3joc_fragmented.mp4.1.dump           |  1 -
 .../mp4/sample_eac3joc_fragmented.mp4.2.dump           |  1 -
 .../mp4/sample_eac3joc_fragmented.mp4.3.dump           |  1 -
 .../sample_eac3joc_fragmented.mp4.unknown_length.dump  |  1 -
 31 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java b/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java
index cfbe95a611..e4a61f3e0b 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java
@@ -158,9 +158,6 @@ public final class Ac3Util {
     if ((nextByte & 0x04) != 0) { // lfeon
       channelCount++;
     }
-    // bit_rate_code - 5 bits. 2 bits from previous byte and 3 bits from next.
-    int halfFrmsizecod = ((nextByte & 0x03) << 3) | ((data.readUnsignedByte() & 0xE0) >> 5);
-    int constantBitrate = BITRATE_BY_HALF_FRMSIZECOD[halfFrmsizecod];
     return new Format.Builder()
         .setId(trackId)
         .setSampleMimeType(MimeTypes.AUDIO_AC3)
@@ -168,8 +165,6 @@ public final class Ac3Util {
         .setSampleRate(sampleRate)
         .setDrmInitData(drmInitData)
         .setLanguage(language)
-        .setAverageBitrate(constantBitrate)
-        .setPeakBitrate(constantBitrate)
         .build();
   }
 
@@ -185,9 +180,7 @@ public final class Ac3Util {
    */
   public static Format parseEAc3AnnexFFormat(
       ParsableByteArray data, String trackId, String language, @Nullable DrmInitData drmInitData) {
-    // 13 bits for data_rate, 3 bits for num_ind_sub which are ignored.
-    int peakBitrate =
-        ((data.readUnsignedByte() & 0xFF) << 5) | ((data.readUnsignedByte() & 0xF8) >> 3);
+    data.skipBytes(2); // data_rate, num_ind_sub
 
     // Read the first independent substream.
     int fscod = (data.readUnsignedByte() & 0xC0) >> 6;
@@ -223,7 +216,6 @@ public final class Ac3Util {
         .setSampleRate(sampleRate)
         .setDrmInitData(drmInitData)
         .setLanguage(language)
-        .setPeakBitrate(peakBitrate)
         .build();
   }
 
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump
index 71eed666b7..c2e51faaef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     maxInputSize = 1566
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump
index a6fbd97784..80f0790cd0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 9216
   sample count = 6
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     maxInputSize = 1566
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump
index e02699e2de..a8d1588940 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 4608
   sample count = 3
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     maxInputSize = 1566
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump
index 4b7e17e7c9..17bf79c850 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 1536
   sample count = 1
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     maxInputSize = 1566
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump
index 71eed666b7..c2e51faaef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     maxInputSize = 1566
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump
index 84217c2e01..3724592554 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump
index 1edd06253f..e9019d4ab1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 10752
   sample count = 7
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump
index 01fd6af916..2b9cb1cd52 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 6144
   sample count = 4
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump
index c303da0e15..eb313f941d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 1536
   sample count = 1
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump
index 84217c2e01..3724592554 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump
@@ -10,8 +10,6 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
     id = 1
     sampleMimeType = audio/ac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump
index aba5268ea2..8000864576 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     maxInputSize = 4030
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump
index ac03cfd484..49ab3da0aa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 144000
   sample count = 36
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     maxInputSize = 4030
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump
index 1a61f528ac..19bfc7c5fa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 72000
   sample count = 18
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     maxInputSize = 4030
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump
index 431599a9be..d34514d8a8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 4000
   sample count = 1
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     maxInputSize = 4030
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump
index aba5268ea2..8000864576 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     maxInputSize = 4030
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump
index 6da60d472a..a7f3c63f8d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump
index 646dd35d91..a627d00633 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 148000
   sample count = 37
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump
index a7ba576bf5..31013410b6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 76000
   sample count = 19
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump
index 280d6febc4..13ff558eaa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 4000
   sample count = 1
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump
index 6da60d472a..a7f3c63f8d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
     id = 1
     sampleMimeType = audio/eac3
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump
index c98e27dc19..ecc28b7208 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump
index 9c9cee29df..d9ed0c417d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 110080
   sample count = 43
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump
index 85c07f6d2d..741d5199ea 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 56320
   sample count = 22
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump
index 56387fb3c7..98fe8c793d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 2560
   sample count = 1
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump
index c98e27dc19..ecc28b7208 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump
index c73a6282e8..c5902f5d19 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump
index 78b392053e..8fa0cbf7fe 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 110080
   sample count = 43
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump
index 2558363342..603ca0de80 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 56320
   sample count = 22
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump
index 084d2aa030..cd42dac917 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 2560
   sample count = 1
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     channelCount = 6
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump
index c73a6282e8..c5902f5d19 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump
@@ -10,7 +10,6 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
     id = 1
     sampleMimeType = audio/eac3-joc
     channelCount = 6