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

Commit c88c5604 authored by Robert Shih's avatar Robert Shih Committed by Android Git Automerger
Browse files

am 6134ad6f: Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on... 

am 6134ad6f: Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio" into mnc-dev

* commit '6134ad6f':
  NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio
parents cef95dbe 6134ad6f

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1474,10 +1474,12 @@ void NuPlayer::determineAudioModeChange() { 
        sp<AMessage> format = mSource->getFormat(true /*audio*/);

        tryOpenAudioSinkForOffload(format, hasVideo);

    } else {

        if (mOffloadAudio) {

            mRenderer->signalDisableOffloadAudio();

            mOffloadAudio = false;

        }

    }

}



status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) {

    if (*decoder != NULL) {

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1422,12 +1422,18 @@ void NuPlayer::Renderer::onDisableOffloadAudio() { 
    Mutex::Autolock autoLock(mLock);

    mFlags &= ~FLAG_OFFLOAD_AUDIO;

    ++mAudioDrainGeneration;

    if (mAudioRenderingStartGeneration != -1) {

        prepareForMediaRenderingStart_l();

    }

}



void NuPlayer::Renderer::onEnableOffloadAudio() {

    Mutex::Autolock autoLock(mLock);

    mFlags |= FLAG_OFFLOAD_AUDIO;

    ++mAudioDrainGeneration;

    if (mAudioRenderingStartGeneration != -1) {

        prepareForMediaRenderingStart_l();

    }

}



void NuPlayer::Renderer::onPause() {