Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1a3af62b: Merge change 23801 into eclair

Browse Source 
Merge commit '1a3af62bfb3583ac2fece18523927587b6b6a277' into eclair-plus-aosp

* commit '1a3af62bfb3583ac2fece18523927587b6b6a277':
  fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
This commit is contained in:
Eric Laurent
2009-09-03 08:02:53 -07:00
committed by Android Git Automerger
parent 7838887af4 1a3af62bfb
commit 6e1e1c6b78
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/audioflinger/AudioFlinger.cpp
View File

@@ -1319,19 +1319,20 @@ size_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track>
mAudioMixer->setBufferProvider(track); mAudioMixer->setBufferProvider(track);
mAudioMixer->enable(AudioMixer::MIXING); mAudioMixer->enable(AudioMixer::MIXING);
int param; int param = AudioMixer::VOLUME;
if ( track->mFillingUpStatus == Track::FS_FILLED) { if (track->mFillingUpStatus == Track::FS_FILLED) {
// no ramp for the first volume setting // no ramp for the first volume setting
track->mFillingUpStatus = Track::FS_ACTIVE; track->mFillingUpStatus = Track::FS_ACTIVE;
if (track->mState == TrackBase::RESUMING) { if (track->mState == TrackBase::RESUMING) {
track->mState = TrackBase::ACTIVE; track->mState = TrackBase::ACTIVE;
param = AudioMixer::RAMP_VOLUME; 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; param = AudioMixer::RAMP_VOLUME;
} }
mAudioMixer->setParameter(param, AudioMixer::VOLUME0, left); mAudioMixer->setParameter(param, AudioMixer::VOLUME0, left);
mAudioMixer->setParameter(param, AudioMixer::VOLUME1, right); mAudioMixer->setParameter(param, AudioMixer::VOLUME1, right);
mAudioMixer->setParameter( mAudioMixer->setParameter(
@@ -1365,7 +1366,7 @@ size_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track>
LOGV("BUFFER TIMEOUT: remove(%d) from active list", track->name()); LOGV("BUFFER TIMEOUT: remove(%d) from active list", track->name());
tracksToRemove->add(track); 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 // written enough data to audio hardware before disabling the track
// NOTE: this condition with arrive before track->mRetryCount <= 0 so we // NOTE: this condition with arrive before track->mRetryCount <= 0 so we
// don't care about code removing track from active list above. // don't care about code removing track from active list above.