From 22b8ab5c098d71f68d285d0caec1ad34e626d4d2 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Fri, 13 Apr 2018 03:18:19 -0700 Subject: [PATCH] Fix initial application of playback parameters ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=192744823 --- .../google/android/exoplayer2/audio/DefaultAudioSink.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java index 371fe50b21..a206d2c1ec 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java @@ -466,8 +466,10 @@ public final class DefaultAudioSink implements AudioSink { } } - // The old playback parameters may no longer be applicable so try to reset them now. - setPlaybackParameters(playbackParameters); + playbackParameters = + canApplyPlaybackParameters + ? applyPlaybackParameters(playbackParameters) + : PlaybackParameters.DEFAULT; setupAudioProcessors(); audioTrackPositionTracker.setAudioTrack(