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

Commit 2d3ca683 authored by Haynes Mathew George's avatar Haynes Mathew George Committed by Eric Laurent
Browse files

audioflinger: OffloadThread fix for resume underrun 

AudioFlinger can miss resuming h/w on a pause->resume transition
if sufficient data isn't available

Bug: 11358524.
Change-Id: Ic3c75256290d3515fd4a96dfcc900909fbe5bc15
parent 16498512

services/audioflinger/Threads.cpp

+22 −20
Original line number Diff line number Diff line
@@ -4223,14 +4223,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
            if (last) {

                mFlushPending = true;

            }

        } else if (track->framesReady() && track->isReady() &&

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

            ALOGVV("OffloadThread: track %d s=%08x [OK]", track->name(), cblk->mServer);

            if (track->mFillingUpStatus == Track::FS_FILLED) {

                track->mFillingUpStatus = Track::FS_ACTIVE;

                // make sure processVolume_l() will apply new volume even if 0

                mLeftVolFloat = mRightVolFloat = -1.0;

                if (track->isResumePending()) {

        } else if (track->isResumePending()){

            track->resumeAck();

            if (last) {

                if (mPausedBytesRemaining) {
@@ -4247,8 +4240,17 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
                }

                // enable write to audio HAL

                sleepTime = 0;



                // Do not handle new data in this iteration even if track->framesReady()

                mixerStatus = MIXER_TRACKS_ENABLED;

            }

                }

        }  else if (track->framesReady() && track->isReady() &&

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

            ALOGVV("OffloadThread: track %d s=%08x [OK]", track->name(), cblk->mServer);

            if (track->mFillingUpStatus == Track::FS_FILLED) {

                track->mFillingUpStatus = Track::FS_ACTIVE;

                // make sure processVolume_l() will apply new volume even if 0

                mLeftVolFloat = mRightVolFloat = -1.0;

            }



            if (last) {

services/audioflinger/Tracks.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1020,9 +1020,13 @@ void AudioFlinger::PlaybackThread::Track::resumeAck() { 


    if (mState == RESUMING)

        mState = ACTIVE;



    // Other possibility of  pending resume is stopping_1 state

    // Do not update the state from stopping as this prevents

    // drain being called.

    if (mState == STOPPING_1) {

        mResumeToStopping = false;

    }

}

// ----------------------------------------------------------------------------