| commit | 91a8c8b65758beb39c716ad594a30ceeb0b6c110 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu May 25 13:23:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 25 13:23:24 2023 +0000 |
| tree | 87d727711d170abc21296b5d7a948a7cdd4ba1bf | |
| parent | b314a2523aca705ac0ea18eebea45be335f3cf38 [diff] | |
| parent | 938aadaf20ba78f68c53b62955967806b590a5e5 [diff] |
Merge "NuPlayer: signal video scaling mode to components that queue to IGBR" am: a90df2a670 am: 938aadaf20 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2600465 Change-Id: I1ca472e58f670abab329f2d94893d7ce074afac1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index d205990..f73c5a8 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -2217,6 +2217,11 @@ -ret, strerror(-ret)); return ret; } + if (mVideoDecoder != NULL) { + sp<AMessage> params = new AMessage(); + params->setInt32("android._video-scaling", mode); + mVideoDecoder->setParameters(params); + } } return OK; }
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 8da09c4..f4143da 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -459,6 +459,14 @@ 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) {