commit a160c6ea053ab317374327d8ba21684b2fac40e4
author Eric Laurent <elaurent@google.com> Thu Sep 03 03:45:52 2009 -0700
committer Eric Laurent <elaurent@google.com> Thu Sep 03 04:11:18 2009 -0700
tree aa9108839842462629e48ebba8a1ff29778a306a
parent 0c36a517cd01a7112460a96f9f0fa2badf8f7015

fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.

Do not ramp volume if the first frame of a track is processed after the track was stopped.
In the case of very short sounds, the track stop request can be received by AudioFlinger just after the start request before the first frame is mixed by AudioMixer. In this case, the track is already in stopped state and initial volume is applied with a ramp for the first frame processed which should not be the case: initial volume change is always applied immediatelly.

libs/audioflinger/AudioFlinger.cpp

diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp
index ef71641..8cb89c3 100644
--- a/libs/audioflinger/AudioFlinger.cpp
+++ b/libs/audioflinger/AudioFlinger.cpp
@@ -1319,19 +1319,20 @@
             mAudioMixer->setBufferProvider(track);
             mAudioMixer->enable(AudioMixer::MIXING);
 
-            int param;
-            if ( track->mFillingUpStatus == Track::FS_FILLED) {
+            int param = AudioMixer::VOLUME;
+            if (track->mFillingUpStatus == Track::FS_FILLED) {
                 // no ramp for the first volume setting
                 track->mFillingUpStatus = Track::FS_ACTIVE;
                 if (track->mState == TrackBase::RESUMING) {
                     track->mState = TrackBase::ACTIVE;
                     param = AudioMixer::RAMP_VOLUME;
-                } else {
-                    param = AudioMixer::VOLUME;
                 }
-            } else {
+            } else if (cblk->server != 0) {
+                // If the track is stopped before the first frame was mixed,
+                // do not apply ramp
                 param = AudioMixer::RAMP_VOLUME;
             }
+
             mAudioMixer->setParameter(param, AudioMixer::VOLUME0, left);
             mAudioMixer->setParameter(param, AudioMixer::VOLUME1, right);
             mAudioMixer->setParameter(
@@ -1365,7 +1366,7 @@
                     LOGV("BUFFER TIMEOUT: remove(%d) from active list", track->name());
                     tracksToRemove->add(track);
                 }
-                // For tracks using static shared memry buffer, make sure that we have
+                // For tracks using static shared memory buffer, make sure that we have
                 // written enough data to audio hardware before disabling the track
                 // NOTE: this condition with arrive before track->mRetryCount <= 0 so we
                 // don't care about code removing track from active list above.