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

Commit 7f8be1da authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "NuPlayer: signal video scaling mode to components that queue to IGBR"... 

Merge "NuPlayer: signal video scaling mode to components that queue to IGBR" am: a90df2a6 am: 938aadaf am: 91a8c8b6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2600465



Change-Id: I8eb081d0704e8a0b7a506aa7cf5c1217975adad5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cdb04573 91a8c8b6

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2224,6 +2224,11 @@ status_t NuPlayer::setVideoScalingMode(int32_t mode) { 
                -ret, strerror(-ret));

            return ret;

        }

        if (mVideoDecoder != NULL) {

            sp<AMessage> params = new AMessage();

            params->setInt32("android._video-scaling", mode);

            mVideoDecoder->setParameters(params);

        }

    }

    return OK;

}

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+8 −0
Original line number Diff line number Diff line
@@ -459,6 +459,14 @@ void NuPlayer::Decoder::onSetParameters(const sp<AMessage> &params) { 
        codecParams->setFloat("operating-rate", decodeFrameRate * mPlaybackSpeed);

        mCodec->setParameters(codecParams);

    }



    int32_t videoScalingMode;

    if (params->findInt32("android._video-scaling", &videoScalingMode)

            && mCodec != NULL) {

        sp<AMessage> codecParams = new AMessage();

        codecParams->setInt32("android._video-scaling", videoScalingMode);

        mCodec->setParameters(codecParams);

    }

}



void NuPlayer::Decoder::onSetRenderer(const sp<Renderer> &renderer) {