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

am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1

Browse Source 
* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback
This commit is contained in:
Eric Laurent
2011-11-09 16:29:04 +00:00
committed by Android Git Automerger
parent c8c5bc443f 2b7f91b932
commit db7d79e6f1
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/audioflinger/AudioFlinger.cpp
View File

@@ -2066,9 +2066,14 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
// The first time a track is added we wait // The first time a track is added we wait
// for all its buffers to be filled before processing it // for all its buffers to be filled before processing it
mAudioMixer->setActiveTrack(track->name()); mAudioMixer->setActiveTrack(track->name());
// make sure that we have enough frames to mix one full buffer // make sure that we have enough frames to mix one full buffer.
// enforce this condition only once to enable draining the buffer in case the client
// app does not call stop() and relies on underrun to stop:
// hence the test on (track->mRetryCount >= kMaxTrackRetries) meaning the track was mixed
// during last round
uint32_t minFrames = 1; uint32_t minFrames = 1;
if (!track->isStopped() && !track->isPausing()) { if (!track->isStopped() && !track->isPausing() &&
(track->mRetryCount >= kMaxTrackRetries)) {
if (t->sampleRate() == (int)mSampleRate) { if (t->sampleRate() == (int)mSampleRate) {
minFrames = mFrameCount; minFrames = mFrameCount;
} else { } else {