Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a30fc13 authored by Eric Laurent's avatar Eric Laurent
Browse files

Fixed AudioFlinger not always pausing tracks 

If the pause request is received before the AudioTrack buffer was
completelly filled and the track ready for mixing, the pause is
not executed: the track just underruns and stays in pausing state.

The fix consists in considering the track ready for mixing immediately
if pausing.

Change-Id: Ia6cb4703fee2126e41011a6400ea8eeb3a3e5456
parent b9a40068

services/audioflinger/AudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1715,7 +1715,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track 
        // The first time a track is added we wait

        // for all its buffers to be filled before processing it

        mAudioMixer->setActiveTrack(track->name());

        if (cblk->framesReady() && (track->isReady() || track->isStopped()) &&

        if (cblk->framesReady() && track->isReady() &&

                !track->isPaused() && !track->isTerminated())

        {

            //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

                // 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())

                {

                    //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 {

    if (mFillingUpStatus != FS_FILLING) return true;

    if (mFillingUpStatus != FS_FILLING || isStopped() || isPausing()) return true;



    if (mCblk->framesReady() >= mCblk->frameCount ||

            (mCblk->flags & CBLK_FORCEREADY_MSK)) {