loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-05 14:40:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make default audio capabilities public + update extractor list.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=117251647
This commit is contained in:
olly 2016-03-15 10:23:39 -07:00 committed by Oliver Woodman
parent 1ead229ac5
commit 8b22333ee9
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java
View File

@ -32,9 +32,9 @@ import java.util.Arrays;
public final class AudioCapabilities { public final class AudioCapabilities {
/** /**
* Default to stereo PCM on SDK < 21 and when HDMI is unplugged. * The minimum audio capabilities supported by all devices.
*/ */
private static final AudioCapabilities DEFAULT_AUDIO_CAPABILITIES = public static final AudioCapabilities DEFAULT_AUDIO_CAPABILITIES =
new AudioCapabilities(new int[] {AudioFormat.ENCODING_PCM_16BIT}, 2); new AudioCapabilities(new int[] {AudioFormat.ENCODING_PCM_16BIT}, 2);
/** /**

11
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
View File

@ -51,15 +51,14 @@ import java.util.List;
* format will be detected automatically from the following supported formats: * format will be detected automatically from the following supported formats:
* *
* <ul> * <ul>
* <li>Fragmented MP4 * <li>MP4, including M4A ({@link com.google.android.exoplayer.extractor.mp4.Mp4Extractor})</li>
* ({@link com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor})</li> * <li>fMP4 ({@link com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor})</li>
* <li>Unfragmented MP4, including M4A * <li>Matroska and WebM ({@link com.google.android.exoplayer.extractor.webm.WebmExtractor})</li>
* ({@link com.google.android.exoplayer.extractor.mp4.Mp4Extractor})</li> * <li>Ogg Vorbis ({@link com.google.android.exoplayer.extractor.ogg.OggVorbisExtractor}</li>
* <li>Matroska, including WebM
* ({@link com.google.android.exoplayer.extractor.webm.WebmExtractor})</li>
* <li>MP3 ({@link com.google.android.exoplayer.extractor.mp3.Mp3Extractor})</li> * <li>MP3 ({@link com.google.android.exoplayer.extractor.mp3.Mp3Extractor})</li>
* <li>AAC ({@link com.google.android.exoplayer.extractor.ts.AdtsExtractor})</li> * <li>AAC ({@link com.google.android.exoplayer.extractor.ts.AdtsExtractor})</li>
* <li>MPEG TS ({@link com.google.android.exoplayer.extractor.ts.TsExtractor}</li> * <li>MPEG TS ({@link com.google.android.exoplayer.extractor.ts.TsExtractor}</li>
* <li>MPEG PS ({@link com.google.android.exoplayer.extractor.ts.PsExtractor}</li>
* <li>FLV ({@link com.google.android.exoplayer.extractor.flv.FlvExtractor}</li> * <li>FLV ({@link com.google.android.exoplayer.extractor.flv.FlvExtractor}</li>
* </ul> * </ul>
* *