From 686816a610db27b95e42e05224e7010ce73979c2 Mon Sep 17 00:00:00 2001 From: eguven Date: Wed, 4 May 2016 04:37:16 -0700 Subject: [PATCH] Fix format constructor parameter order. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=121468904 --- .../com/google/android/exoplayer/ext/flac/FlacExtractor.java | 2 +- .../com/google/android/exoplayer/extractor/ogg/FlacReader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java index 3f7a3beb8b..19820362e0 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java @@ -105,7 +105,7 @@ public final class FlacExtractor implements Extractor { }); Format mediaFormat = Format.createAudioSampleFormat(null, MimeTypes.AUDIO_RAW, - Format.NO_VALUE, streamInfo.bitRate(), + streamInfo.bitRate(), Format.NO_VALUE, streamInfo.channels, streamInfo.sampleRate, null, null); trackOutput.format(mediaFormat); diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java index 1b539e542f..f7b19044a9 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java @@ -67,7 +67,7 @@ import java.util.List; metadata[4] = (byte) 0x80; // Set the last metadata block flag, ignore the other blocks List initializationData = Collections.singletonList(metadata); trackOutput.format(Format.createAudioSampleFormat(null, MimeTypes.AUDIO_FLAC, - Format.NO_VALUE, streamInfo.bitRate(), streamInfo.channels, streamInfo.sampleRate, + streamInfo.bitRate(), Format.NO_VALUE, streamInfo.channels, streamInfo.sampleRate, initializationData, null)); } else if (data[0] == AUDIO_PACKET_TYPE) { if (!firstAudioPacketProcessed) {