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

Commit 0f02f265 authored by Haynes Mathew George's avatar Haynes Mathew George Committed by Eric Laurent
Browse files

audioflinger: OffloadThread state fix 

When switching from one offload session to another that
reuses the same offload output, audio HAL is paused & flushed in
preparation for the new track

OffloadThread must reset mHwPaused to allow proper state transitions
for the second track. In addition, Offload thread need not
explicitly call resume on HAL while handling a flush.

Bug: 12530661
Change-Id: I8173845e1782b5a8b372a82c7d337299a61e0efe
parent 7ca6e73b

services/audioflinger/Threads.cpp

+2 −3
Original line number Diff line number Diff line
@@ -4146,9 +4146,6 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
    // if resume is received before pause is executed.

    if (!mStandby && (doHwPause || (mFlushPending && !mHwPaused && (count != 0)))) {

        mOutput->stream->pause(mOutput->stream);

        if (!doHwPause) {

            doHwResume = true;

        }

    }

    if (mFlushPending) {

        flushHw_l();
@@ -4209,6 +4206,8 @@ void AudioFlinger::OffloadThread::flushHw_l() 
    mBytesRemaining = 0;

    mPausedWriteLength = 0;

    mPausedBytesRemaining = 0;

    mHwPaused = false;



    if (mUseAsyncWrite) {

        // discard any pending drain or write ack by incrementing sequence

        mWriteAckSequence = (mWriteAckSequence + 2) & ~1;