From 30dce91fc04686fbb7e391ab6fb79dcd2044b25c Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Thu, 24 Nov 2022 18:14:44 +0000
Subject: [PATCH] Convert bitrates to bps before setting it

Format expects the values of `averageBitrate` and `peakBitrate` in bps and the value fetched from AC3SpecificBox and EC3SpecificBox is in kbps.

PiperOrigin-RevId: 490756581
(cherry picked from commit 4066970ce7292642794f4a3954f8d0fde78dd310)
---
 .../src/main/java/androidx/media3/extractor/Ac3Util.java      | 4 ++--
 .../src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump  | 4 ++--
 .../src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump  | 4 ++--
 .../src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump  | 4 ++--
 .../src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump  | 4 ++--
 .../extractordumps/mp4/sample_ac3.mp4.unknown_length.dump     | 4 ++--
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump       | 4 ++--
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump       | 4 ++--
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump       | 4 ++--
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump       | 4 ++--
 .../mp4/sample_ac3_fragmented.mp4.unknown_length.dump         | 4 ++--
 .../src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump | 2 +-
 .../src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump | 2 +-
 .../src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump | 2 +-
 .../src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump | 2 +-
 .../extractordumps/mp4/sample_eac3.mp4.unknown_length.dump    | 2 +-
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump      | 2 +-
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump      | 2 +-
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump      | 2 +-
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump      | 2 +-
 .../mp4/sample_eac3_fragmented.mp4.unknown_length.dump        | 2 +-
 .../test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump  | 2 +-
 .../test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump  | 2 +-
 .../test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump  | 2 +-
 .../test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump  | 2 +-
 .../extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump | 2 +-
 .../extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump   | 2 +-
 .../extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump   | 2 +-
 .../extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump   | 2 +-
 .../extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump   | 2 +-
 .../mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump     | 2 +-
 31 files changed, 42 insertions(+), 42 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 78baffd5b5..b9279635d8 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java
@@ -162,7 +162,7 @@ public final class Ac3Util {
       channelCount++;
     }
     int halfFrmsizecod = dataBitArray.readBits(5); // bit_rate_code
-    int constantBitrate = BITRATE_BY_HALF_FRMSIZECOD[halfFrmsizecod];
+    int constantBitrate = BITRATE_BY_HALF_FRMSIZECOD[halfFrmsizecod] * 1000;
     // Update data position
     dataBitArray.byteAlign();
     data.setPosition(dataBitArray.getBytePosition());
@@ -193,7 +193,7 @@ public final class Ac3Util {
     ParsableBitArray dataBitArray = new ParsableBitArray();
     dataBitArray.reset(data);
 
-    int peakBitrate = dataBitArray.readBits(13); // data_rate
+    int peakBitrate = dataBitArray.readBits(13) * 1000; // data_rate
     dataBitArray.skipBits(3); // num_ind_sub
 
     // Read the first independent substream.
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..97bfb758dc 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,8 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..9e9b211ed9 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,8 @@ track 0:
   total output bytes = 9216
   sample count = 6
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..4e872b3fd5 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,8 @@ track 0:
   total output bytes = 4608
   sample count = 3
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..138696f8a7 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,8 @@ track 0:
   total output bytes = 1536
   sample count = 1
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..97bfb758dc 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,8 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..448e79e1fd 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,8 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..0f902e441a 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,8 @@ track 0:
   total output bytes = 10752
   sample count = 7
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..d747be40c5 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,8 @@ track 0:
   total output bytes = 6144
   sample count = 4
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..76738dd5b3 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,8 @@ track 0:
   total output bytes = 1536
   sample count = 1
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..448e79e1fd 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,8 @@ track 0:
   total output bytes = 13824
   sample count = 9
   format 0:
-    averageBitrate = 384
-    peakBitrate = 384
+    averageBitrate = 384000
+    peakBitrate = 384000
     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..a50ee9fecd 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,7 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..089c940439 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,7 @@ track 0:
   total output bytes = 144000
   sample count = 36
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..5d481314d5 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,7 @@ track 0:
   total output bytes = 72000
   sample count = 18
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..0242518866 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,7 @@ track 0:
   total output bytes = 4000
   sample count = 1
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..a50ee9fecd 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,7 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..734051bb2d 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,7 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..027e7eb633 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,7 @@ track 0:
   total output bytes = 148000
   sample count = 37
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..db94e2636e 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,7 @@ track 0:
   total output bytes = 76000
   sample count = 19
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..854d952ad8 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,7 @@ track 0:
   total output bytes = 4000
   sample count = 1
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..734051bb2d 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,7 @@ track 0:
   total output bytes = 216000
   sample count = 54
   format 0:
-    peakBitrate = 1000
+    peakBitrate = 1000000
     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..45a51b50ae 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,7 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..4ad3e45f53 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,7 @@ track 0:
   total output bytes = 110080
   sample count = 43
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..0c53717c22 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,7 @@ track 0:
   total output bytes = 56320
   sample count = 22
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..c8cd33b57b 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,7 @@ track 0:
   total output bytes = 2560
   sample count = 1
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..45a51b50ae 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,7 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..87930b0bfb 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,7 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..e1aa764cfb 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,7 @@ track 0:
   total output bytes = 110080
   sample count = 43
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..c9f083805f 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,7 @@ track 0:
   total output bytes = 56320
   sample count = 22
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..a3875f612d 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,7 @@ track 0:
   total output bytes = 2560
   sample count = 1
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     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..87930b0bfb 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,7 @@ track 0:
   total output bytes = 163840
   sample count = 64
   format 0:
-    peakBitrate = 640
+    peakBitrate = 640000
     id = 1
     sampleMimeType = audio/eac3-joc
     channelCount = 6