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

Commit ea0fadeb authored by Eric Laurent's avatar Eric Laurent
Browse files

audioflinger: offload: fix pause/flush/resume 

If a pause/flush/resume sequence is fast enough, resume is received while
we are still in PAUSING state in which case it is a NOP. If this happens,
flush is still forwarded to the audio HAL but is not preceeded by a pause
which can cause problems to the audio DSP.
It is necessary to preserve the flush as this sequence is typical to a seek.

The fix consists in forcing a pause/resume when a flush request must be
executed and the audio HAL has not been paused previously.

Bug: 11081559.
Change-Id: Ib84ed26d503a61c05933b923ec556b10cedfe140
parent 026c5b07

services/audioflinger/Threads.cpp

+9 −2
Original line number Diff line number Diff line
@@ -3864,6 +3864,7 @@ AudioFlinger::OffloadThread::OffloadThread(const sp<AudioFlinger>& audioFlinger, 
        AudioStreamOut* output, audio_io_handle_t id, uint32_t device)

    :   DirectOutputThread(audioFlinger, output, id, device, OFFLOAD),

        mHwPaused(false),

        mFlushPending(false),

        mPausedBytesRemaining(0)

{

}
@@ -4029,9 +4030,15 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
        processVolume_l(track, last);

    }



    // make sure the pause/flush/resume sequence is executed in the right order

    if (doHwPause) {

    // make sure the pause/flush/resume sequence is executed in the right order.

    // If a flush is pending and a track is active but the HW is not paused, force a HW pause

    // before flush and then resume HW. This can happen in case of pause/flush/resume

    // if resume is received before pause is executed.

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

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

        if (!doHwPause) {

            doHwResume = true;

        }

    }

    if (mFlushPending) {

        flushHw_l();