Fix FLAC bit rate computation

PiperOrigin-RevId: 279088193
2019-11-07 16:05:30 +00:00 · 2019-11-07 16:05:30 +00:00 · d1da3d925b
commit d1da3d925b
parent a226bd0d69
19 changed files with 19 additions and 19 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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. */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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