Skip to content

SDK / exoplayer

Go to a project
Commit d1da3d92 by kimvde Committed by Oliver Woodman
Options

Fix FLAC bit rate computation 

PiperOrigin-RevId: 279088193
parent a226bd0d
Inline Side-by-side
Showing with 19 additions and 19 deletions
extensions/flac/src/androidTest/assets/bear.flac.0.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
extensions/flac/src/androidTest/assets/bear.flac.1.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
extensions/flac/src/androidTest/assets/bear.flac.2.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
extensions/flac/src/androidTest/assets/bear.flac.3.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/raw sampleMimeType = audio/raw
......
library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamMetadata.java
...@@ -109,7 +109,7 @@ public final class FlacStreamMetadata { ...@@ -109,7 +109,7 @@ public final class FlacStreamMetadata {
/** Returns the bit-rate of the FLAC stream. */ /** Returns the bit-rate of the FLAC stream. */
public int bitRate() { public int bitRate() {
return bitsPerSample * sampleRate; return bitsPerSample * sampleRate * channels;
} }
/** Returns the duration of the FLAC stream in microseconds. */ /** Returns the duration of the FLAC stream in microseconds. */
......
library/core/src/test/assets/ogg/bear_flac.ogg.0.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac.ogg.1.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac.ogg.2.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac.ogg.3.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
...@@ -5,7 +5,7 @@ seekMap: ...@@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1 numberOfTracks = 1
track 0: track 0:
format: format:
bitrate = 768000 bitrate = 1536000
id = null id = null
containerMimeType = null containerMimeType = null
sampleMimeType = audio/flac sampleMimeType = audio/flac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment