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

Commit 037db3ba authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not set stream state as STOPPED when stream EOS is pending." into main

parents 8b07eca1 159056dd

media/libaaudio/src/legacy/AudioStreamTrack.cpp

+5 −4
Original line number Diff line number Diff line
@@ -470,11 +470,10 @@ aaudio_result_t AudioStreamTrack::processCommands() { 
    case AAUDIO_STREAM_STATE_STOPPING:

        if (mAudioTrack->stopped()) {

            if (getPerformanceMode() == AAUDIO_PERFORMANCE_MODE_POWER_SAVING_OFFLOADED) {

                std::lock_guard<std::mutex> lock(mStreamLock);

                if (!mOffloadEosPending) {

                // For offload mode, the state will be updated as `STOPPED` from

                // stream end callback.

                break;

            }

            }

            setState(AAUDIO_STREAM_STATE_STOPPED);

        }

        break;
@@ -703,6 +702,8 @@ void AudioStreamTrack::onStreamEnd() { 
        std::lock_guard<std::mutex> lock(mStreamLock);

        if (mOffloadEosPending) {

            requestStart_l();

        } else {

            setState(AAUDIO_STREAM_STATE_STOPPED);

        }

        mOffloadEosPending = false;

    }