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

Commit 30f4dfaf authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "nuplayer: Has video hint for offload"

parents f75c2fef 8b63533e

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,8 @@ status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) { 
        notify->setInt32("generation", mAudioDecoderGeneration);



        if (mOffloadAudio) {

            const bool hasVideo = (mSource->getFormat(false /*audio */) != NULL);

            format->setInt32("has-video", hasVideo);

            *decoder = new DecoderPassThrough(notify, mSource, mRenderer);

        } else {

            *decoder = new Decoder(notify, mSource, mRenderer);

media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp

+4 −1
Original line number Diff line number Diff line
@@ -74,11 +74,14 @@ void NuPlayer::DecoderPassThrough::onConfigure(const sp<AMessage> &format) { 


    onRequestInputBuffers();



    int32_t hasVideo = 0;

    format->findInt32("has-video", &hasVideo);



    // The audio sink is already opened before the PassThrough decoder is created.

    // Opening again might be relevant if decoder is instantiated after shutdown and

    // format is different.

    status_t err = mRenderer->openAudioSink(

            format, true /* offloadOnly */, false /* hasVideo */,

            format, true /* offloadOnly */, hasVideo,

            AUDIO_OUTPUT_FLAG_NONE /* flags */, NULL /* isOffloaded */);

    if (err != OK) {

        handleError(err);