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

Commit a17b968d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "NuPlayer: cancel pauseTimeout when tearing down offload"

parents 9a8cc9ea 884d6e2a

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                if (reason == Renderer::kDueToTimeout && !(mPaused && mOffloadAudio)) {

                    // TimeoutWhenPaused is only for offload mode.

                    ALOGW("Receive a stale message for teardown.");

                    mRenderer->signalAudioTearDownComplete();

                    break;

                }

                closeAudioSink();

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1747,6 +1747,10 @@ void NuPlayer::Renderer::onAudioTearDown(AudioTearDownReason reason) { 
    if (mAudioTearingDown) {

        return;

    }

    if (offloadingAudio() && mPaused) {

        cancelAudioOffloadPauseTimeout();

    }



    mAudioTearingDown = true;



    int64_t currentPositionUs;