From d1da3d925bc4bf43c874390a98ceade045237e6c Mon Sep 17 00:00:00 2001 From: kimvde Date: Thu, 7 Nov 2019 16:05:30 +0000 Subject: [PATCH] Fix FLAC bit rate computation PiperOrigin-RevId: 279088193 --- extensions/flac/src/androidTest/assets/bear.flac.0.dump | 2 +- extensions/flac/src/androidTest/assets/bear.flac.1.dump | 2 +- extensions/flac/src/androidTest/assets/bear.flac.2.dump | 2 +- extensions/flac/src/androidTest/assets/bear.flac.3.dump | 2 +- .../flac/src/androidTest/assets/bear_with_id3.flac.0.dump | 2 +- .../flac/src/androidTest/assets/bear_with_id3.flac.1.dump | 2 +- .../flac/src/androidTest/assets/bear_with_id3.flac.2.dump | 2 +- .../flac/src/androidTest/assets/bear_with_id3.flac.3.dump | 2 +- .../com/google/android/exoplayer2/util/FlacStreamMetadata.java | 2 +- library/core/src/test/assets/ogg/bear_flac.ogg.0.dump | 2 +- library/core/src/test/assets/ogg/bear_flac.ogg.1.dump | 2 +- library/core/src/test/assets/ogg/bear_flac.ogg.2.dump | 2 +- library/core/src/test/assets/ogg/bear_flac.ogg.3.dump | 2 +- library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump | 2 +- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump | 2 +- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump | 2 +- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump | 2 +- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump | 2 +- .../src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/extensions/flac/src/androidTest/assets/bear.flac.0.dump b/extensions/flac/src/androidTest/assets/bear.flac.0.dump index 71359322b0..87060e8d61 100644 --- a/extensions/flac/src/androidTest/assets/bear.flac.0.dump +++ b/extensions/flac/src/androidTest/assets/bear.flac.0.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/extensions/flac/src/androidTest/assets/bear.flac.1.dump b/extensions/flac/src/androidTest/assets/bear.flac.1.dump index 820b9eed10..b12f4dbf9d 100644 --- a/extensions/flac/src/androidTest/assets/bear.flac.1.dump +++ b/extensions/flac/src/androidTest/assets/bear.flac.1.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/extensions/flac/src/androidTest/assets/bear.flac.2.dump b/extensions/flac/src/androidTest/assets/bear.flac.2.dump index c2d58347eb..613023e86c 100644 --- a/extensions/flac/src/androidTest/assets/bear.flac.2.dump +++ b/extensions/flac/src/androidTest/assets/bear.flac.2.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/extensions/flac/src/androidTest/assets/bear.flac.3.dump b/extensions/flac/src/androidTest/assets/bear.flac.3.dump index 8c1115f1ec..79f369751c 100644 --- a/extensions/flac/src/androidTest/assets/bear.flac.3.dump +++ b/extensions/flac/src/androidTest/assets/bear.flac.3.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump index d8903fcade..3a3ba57572 100644 --- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump +++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump index 100fdd1eaf..a07fcaa0a2 100644 --- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump +++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump index 6c3cd731b3..c4d13dd2e6 100644 --- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump +++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump index decf9c6af3..2f389909e7 100644 --- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump +++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/raw diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamMetadata.java index 2c814294af..9c5862b483 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamMetadata.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamMetadata.java @@ -109,7 +109,7 @@ public final class FlacStreamMetadata { /** Returns the bit-rate of the FLAC stream. */ public int bitRate() { - return bitsPerSample * sampleRate; + return bitsPerSample * sampleRate * channels; } /** Returns the duration of the FLAC stream in microseconds. */ diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.0.dump b/library/core/src/test/assets/ogg/bear_flac.ogg.0.dump index 5b8d893f1a..ccd09181a8 100644 --- a/library/core/src/test/assets/ogg/bear_flac.ogg.0.dump +++ b/library/core/src/test/assets/ogg/bear_flac.ogg.0.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.1.dump b/library/core/src/test/assets/ogg/bear_flac.ogg.1.dump index fff76c5b05..0f36b2b32e 100644 --- a/library/core/src/test/assets/ogg/bear_flac.ogg.1.dump +++ b/library/core/src/test/assets/ogg/bear_flac.ogg.1.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.2.dump b/library/core/src/test/assets/ogg/bear_flac.ogg.2.dump index b4d3534161..b3ff58e707 100644 --- a/library/core/src/test/assets/ogg/bear_flac.ogg.2.dump +++ b/library/core/src/test/assets/ogg/bear_flac.ogg.2.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.3.dump b/library/core/src/test/assets/ogg/bear_flac.ogg.3.dump index 27c29cba58..ea2eff8b04 100644 --- a/library/core/src/test/assets/ogg/bear_flac.ogg.3.dump +++ b/library/core/src/test/assets/ogg/bear_flac.ogg.3.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump b/library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump index 5b8d893f1a..ccd09181a8 100644 --- a/library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump +++ b/library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump index 2ecdc9784c..0972d17f2f 100644 --- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump +++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump index 0ed2a86b9e..e33b81c90f 100644 --- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump +++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump index 229e90584e..b8b7d85393 100644 --- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump +++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump index 89c6d178ff..c866017548 100644 --- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump +++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump index 7a4ba81f23..735d97eed1 100644 --- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump +++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = 768000 + bitrate = 1536000 id = null containerMimeType = null sampleMimeType = audio/flac