From 8b22333ee9785004b1b19f66bc4140859d6fca03 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 15 Mar 2016 10:23:39 -0700 Subject: [PATCH] Make default audio capabilities public + update extractor list. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=117251647 --- .../android/exoplayer/audio/AudioCapabilities.java | 4 ++-- .../exoplayer/extractor/ExtractorSampleSource.java | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java b/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java index f470f9ebab..33ff498aa7 100644 --- a/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java +++ b/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java @@ -32,9 +32,9 @@ import java.util.Arrays; 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); /** diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java index db13fbacb4..7ee450c2bd 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java @@ -51,15 +51,14 @@ import java.util.List; * format will be detected automatically from the following supported formats: * * *