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

Commit 728a7aa0 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "NuPlayerRenderer: Allow immediate pause on next track."

parents 469826c6 8420073f

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1552,10 +1552,9 @@ void NuPlayer::Renderer::onPause() { 
    mDrainAudioQueuePending = false;

    mDrainVideoQueuePending = false;



    if (mHasAudio) {

    // Note: audio data may not have been decoded, and the AudioSink may not be opened.

    mAudioSink->pause();

    startAudioOffloadPauseTimeout();

    }



    ALOGV("now paused audio queue has %zu entries, video has %zu entries",

          mAudioQueue.size(), mVideoQueue.size());
@@ -1566,8 +1565,9 @@ void NuPlayer::Renderer::onResume() { 
        return;

    }



    if (mHasAudio) {

    // Note: audio data may not have been decoded, and the AudioSink may not be opened.

    cancelAudioOffloadPauseTimeout();

    if (mAudioSink->ready()) {

        status_t err = mAudioSink->start();

        if (err != OK) {

            ALOGE("cannot start AudioSink err %d", err);