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

Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread

Browse Source
This commit is contained in:
Eric Laurent
2010-10-05 17:06:16 -07:00
committed by Android (Google) Code Review
parent 59c4cb9e8f 9a30fc13f5
commit 37947afe90
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/audioflinger/AudioFlinger.cpp
View File

@@ -1715,7 +1715,7 @@ 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());
if (cblk->framesReady() && (track->isReady() || track->isStopped()) && if (cblk->framesReady() && track->isReady() &&
!track->isPaused() && !track->isTerminated()) !track->isPaused() && !track->isTerminated())
{ {
//LOGV("track %d u=%08x, s=%08x [OK] on thread %p", track->name(), cblk->user, cblk->server, this); //LOGV("track %d u=%08x, s=%08x [OK] on thread %p", track->name(), cblk->user, cblk->server, this);
@@ -2231,7 +2231,7 @@ bool AudioFlinger::DirectOutputThread::threadLoop()
// 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
if (cblk->framesReady() && (track->isReady() || track->isStopped()) && if (cblk->framesReady() && track->isReady() &&
!track->isPaused() && !track->isTerminated()) !track->isPaused() && !track->isTerminated())
{ {
//LOGV("track %d u=%08x, s=%08x [OK]", track->name(), cblk->user, cblk->server); //LOGV("track %d u=%08x, s=%08x [OK]", track->name(), cblk->user, cblk->server);
@@ -3039,7 +3039,7 @@ getNextBuffer_exit:
} }
bool AudioFlinger::PlaybackThread::Track::isReady() const { bool AudioFlinger::PlaybackThread::Track::isReady() const {
if (mFillingUpStatus != FS_FILLING) return true; if (mFillingUpStatus != FS_FILLING || isStopped() || isPausing()) return true;
if (mCblk->framesReady() >= mCblk->frameCount || if (mCblk->framesReady() >= mCblk->frameCount ||
(mCblk->flags & CBLK_FORCEREADY_MSK)) { (mCblk->flags & CBLK_FORCEREADY_MSK)) {