From 165ff55502d52e99586f0d7ed72964617e7e3540 Mon Sep 17 00:00:00 2001 From: kimvde Date: Mon, 4 Nov 2019 10:10:57 +0000 Subject: [PATCH] Fix inverted arguments in FlacReader format creation PiperOrigin-RevId: 278332587 --- .../google/android/exoplayer2/extractor/ogg/FlacReader.java | 4 ++-- library/core/src/test/assets/ogg/bear_flac.ogg.0.dump | 4 ++-- library/core/src/test/assets/ogg/bear_flac.ogg.1.dump | 4 ++-- library/core/src/test/assets/ogg/bear_flac.ogg.2.dump | 4 ++-- library/core/src/test/assets/ogg/bear_flac.ogg.3.dump | 4 ++-- library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump | 4 ++-- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump | 4 ++-- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump | 4 ++-- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump | 4 ++-- .../core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump | 4 ++-- .../src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java index 6f64112e4c..cc536acb14 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java @@ -80,8 +80,8 @@ import java.util.List; /* id= */ null, MimeTypes.AUDIO_FLAC, /* codecs= */ null, - /* bitrate= */ Format.NO_VALUE, - /* maxInputSize= */ streamMetadata.bitRate(), + streamMetadata.bitRate(), + /* maxInputSize= */ Format.NO_VALUE, streamMetadata.channels, streamMetadata.sampleRate, initializationData, 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 dbe97c02bd..5b8d893f1a 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 d1246a3e64..fff76c5b05 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 ec0336309a..b4d3534161 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 1e3254a9fc..27c29cba58 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 dbe97c02bd..5b8d893f1a 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 cce7bf2450..2ecdc9784c 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 ac36a48412..0ed2a86b9e 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 dae0d878fa..229e90584e 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 c9570ab58e..89c6d178ff 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0 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 7a3e7ef5ac..7a4ba81f23 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,11 +5,11 @@ seekMap: numberOfTracks = 1 track 0: format: - bitrate = -1 + bitrate = 768000 id = null containerMimeType = null sampleMimeType = audio/flac - maxInputSize = 768000 + maxInputSize = -1 width = -1 height = -1 frameRate = -1.0