From e4e6a1caf0298a325d1276d1fd958e4e1c300348 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Fri, 17 Apr 2015 19:59:03 +0100 Subject: [PATCH] Switch from AudioFormat.ENCODING_DEFAULT to .ENCODING_PCM_16BIT. AudioTrack.getMinBufferSize does not handle ENCODING_DEFAULT so switch back to ENCODING_PCM_16BIT. --- .../android/exoplayer/demo/player/DashRendererBuilder.java | 2 +- .../android/exoplayer/MediaCodecAudioTrackRenderer.java | 2 +- .../java/com/google/android/exoplayer/audio/AudioTrack.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java b/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java index 1edc9e2e66..f089c48f15 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java @@ -299,7 +299,7 @@ public class DashRendererBuilder implements RendererBuilder, boolean useAc3Passthrough = haveAc3Tracks && audioCapabilities != null && (audioCapabilities.supportsAc3() || audioCapabilities.supportsEAc3()); audioRenderer = new MediaCodecAudioTrackRenderer(audioSampleSource, drmSessionManager, true, - mainHandler, player, useAc3Passthrough ? C.ENCODING_AC3 : AudioFormat.ENCODING_DEFAULT); + mainHandler, player, useAc3Passthrough ? C.ENCODING_AC3 : AudioFormat.ENCODING_PCM_16BIT); } // Build the text chunk sources. diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java index f23510f1dc..ba98373319 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java @@ -125,7 +125,7 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer { public MediaCodecAudioTrackRenderer(SampleSource source, DrmSessionManager drmSessionManager, boolean playClearSamplesWithoutKeys, Handler eventHandler, EventListener eventListener) { this(source, drmSessionManager, playClearSamplesWithoutKeys, eventHandler, eventListener, - AudioFormat.ENCODING_DEFAULT); + AudioFormat.ENCODING_PCM_16BIT); } /** diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java index 39e3ff8d23..c589b813d3 100644 --- a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java +++ b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java @@ -313,10 +313,10 @@ public final class AudioTrack { /** * Reconfigures the audio track to play back media in {@code format}. The encoding is assumed to - * be {@link AudioFormat#ENCODING_DEFAULT}. + * be {@link AudioFormat#ENCODING_PCM_16BIT}. */ public void reconfigure(MediaFormat format) { - reconfigure(format, AudioFormat.ENCODING_DEFAULT, 0); + reconfigure(format, AudioFormat.ENCODING_PCM_16BIT, 0); } /**