From 7b0889981822a2e3f6e8d6145491827a7a4fa1e2 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 30 Nov 2017 05:39:50 -0800
Subject: [PATCH] Move resetting audio processors to initialize()

The set of active audio processors was only updated on reconfiguration and when
draining playback parameters completed. Draining playback parameters are cleared
in reset(), so if parameters were set while paused then the sink was quickly
reset, without draining completing, the set of active audio processors wouldn't
be updated. This means that a switch to or from speed or pitch = 1 would not be
handled correctly if made while paused and followed by a seek.

Move resetting active audio processors from configure (where if the active audio
processors were reset we'd always initialize a new AudioTrack) to initialize().

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177442098
---
 RELEASENOTES.md                                             | 2 ++
 .../google/android/exoplayer2/audio/DefaultAudioSink.java   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 90dbdb6b00..3a42311b26 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,6 +25,8 @@
   preferred language is not available
   ([#2980](https://github.com/google/ExoPlayer/issues/2980)).
 * Add optional parameter to `Player.stop` to reset the player when stopping.
+* Fix handling of playback parameters changes while paused when followed by a
+  seek.
 
 ### 2.6.0 ###
 
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 3b14b69916..ab4564e2c3 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
@@ -364,9 +364,6 @@ public final class DefaultAudioSink implements AudioSink {
           encoding = audioProcessor.getOutputEncoding();
         }
       }
-      if (flush) {
-        resetAudioProcessors();
-      }
     }
 
     int channelConfig;
@@ -492,6 +489,9 @@ public final class DefaultAudioSink implements AudioSink {
     // The old playback parameters may no longer be applicable so try to reset them now.
     setPlaybackParameters(playbackParameters);
 
+    // Flush and reset active audio processors.
+    resetAudioProcessors();
+
     int audioSessionId = audioTrack.getAudioSessionId();
     if (enablePreV21AudioSessionWorkaround) {
       if (Util.SDK_INT < 21) {