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

Commit 08f59877 authored by Andy Hung's avatar Andy Hung Committed by Android Git Automerger
Browse files

am 82b34505: Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-dev 

* commit '82b34505':
  NuPlayerRenderer: Do not drain audio during teardown
parents 9d6d6cf5 82b34505

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -807,6 +807,10 @@ void NuPlayer::Renderer::drainAudioQueueUntilLastEOS() { 
}



bool NuPlayer::Renderer::onDrainAudioQueue() {

    // do not drain audio during teardown as queued buffers may be invalid.

    if (mAudioTornDown) {

        return false;

    }

    // TODO: This call to getPosition checks if AudioTrack has been created

    // in AudioSink before draining audio. If AudioTrack doesn't exist, then

    // CHECKs on getPosition will fail.
@@ -1494,6 +1498,7 @@ void NuPlayer::Renderer::onResume() { 
        cancelAudioOffloadPauseTimeout();

        status_t err = mAudioSink->start();

        if (err != OK) {

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

            notifyAudioTearDown();

        }

    }