sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix format constructor parameter order.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=121468904
This commit is contained in:
eguven 2016-05-04 04:37:16 -07:00 committed by Oliver Woodman
parent 45a46c3e6e
commit 686816a610
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java
View file

@ -105,7 +105,7 @@ public final class FlacExtractor implements Extractor {
}); });
Format mediaFormat = Format.createAudioSampleFormat(null, MimeTypes.AUDIO_RAW, Format mediaFormat = Format.createAudioSampleFormat(null, MimeTypes.AUDIO_RAW,
Format.NO_VALUE, streamInfo.bitRate(), streamInfo.bitRate(), Format.NO_VALUE,
streamInfo.channels, streamInfo.sampleRate, null, null); streamInfo.channels, streamInfo.sampleRate, null, null);
trackOutput.format(mediaFormat); trackOutput.format(mediaFormat);

2
library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java
View file

@ -67,7 +67,7 @@ import java.util.List;
metadata[4] = (byte) 0x80; // Set the last metadata block flag, ignore the other blocks metadata[4] = (byte) 0x80; // Set the last metadata block flag, ignore the other blocks
List<byte[]> initializationData = Collections.singletonList(metadata); List<byte[]> initializationData = Collections.singletonList(metadata);
trackOutput.format(Format.createAudioSampleFormat(null, MimeTypes.AUDIO_FLAC, 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)); initializationData, null));
} else if (data[0] == AUDIO_PACKET_TYPE) { } else if (data[0] == AUDIO_PACKET_TYPE) {
if (!firstAudioPacketProcessed) { if (!firstAudioPacketProcessed) {