commit 7f8be1daef2d520d0555b33c6ec95879461a95fb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 25 14:10:26 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 25 14:10:26 2023 +0000
tree f9ddd4a3fd752a3a1f2da068428eb24a4cd8c54a
parent cdb04573b247d7fda22ffdf931b16147c97fbfe9
parent 91a8c8b65758beb39c716ad594a30ceeb0b6c110

Merge "NuPlayer: signal video scaling mode to components that queue to IGBR" am: a90df2a670 am: 938aadaf20 am: 91a8c8b657

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

Change-Id: I8eb081d0704e8a0b7a506aa7cf5c1217975adad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index e5f2b2b..485923f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -2224,6 +2224,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;
 }

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

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) {