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

Commit dd6a1764 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev 

* commit 'c08872f9':
  NuPlayerRenderer: handle error when resuming an offloaded track
parents 3264b251 c08872f9

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ status_t AudioTrack::set( 
    mTransfer = transferType;

    mDoNotReconnect = doNotReconnect;



    ALOGV_IF(sharedBuffer != 0, "sharedBuffer: %p, size: %d", sharedBuffer->pointer(),

    ALOGV_IF(sharedBuffer != 0, "sharedBuffer: %p, size: %zu", sharedBuffer->pointer(),

            sharedBuffer->size());



    ALOGV("set() streamType %d frameCount %zu flags %04x", streamType, frameCount, flags);

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1469,7 +1469,10 @@ void NuPlayer::Renderer::onResume() { 


    if (mHasAudio) {

        cancelAudioOffloadPauseTimeout();

        mAudioSink->start();

        status_t err = mAudioSink->start();

        if (err != OK) {

            notifyAudioTearDown();

        }

    }



    {