commit 186f4ac0f006de84d940a460bb44ee0e325fd1eb
author Andy Hung <hunga@google.com> Fri Feb 08 19:47:03 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 08 19:47:03 2019 +0000
tree 3b0da685352a1392eeb3081ca02cbd52d93242f1
parent cc423d49c662a03627d7f855f8111c5938f0cf11
parent 453bcb548feb5661b0468a137950e8db521eb9d2

Merge "audio: don't apply ramp if track is paused before the first mix"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index d7c1824..f438493 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4784,7 +4784,10 @@
                 track->mFillingUpStatus = Track::FS_ACTIVE;
                 if (track->mState == TrackBase::RESUMING) {
                     track->mState = TrackBase::ACTIVE;
-                    param = AudioMixer::RAMP_VOLUME;
+                    // If a new track is paused immediately after start, do not ramp on resume.
+                    if (cblk->mServer != 0) {
+                        param = AudioMixer::RAMP_VOLUME;
+                    }
                 }
                 mAudioMixer->setParameter(trackId, AudioMixer::RESAMPLE, AudioMixer::RESET, NULL);
                 mLeftVolFloat = -1.0;