commit 051238c27581d99cc9f411fa97e03c79208a566f
author Wonsik Kim <wonsik@google.com> Thu Jun 13 21:16:23 2024 +0000
committer Wonsik Kim <wonsik@google.com> Thu Jun 13 21:16:23 2024 +0000
tree 8833a8db9372ab92fd870c7505efebb2350d2954
parent 48adf671960bdbd3265d32d099e4331eaa0bc1ec

CCodec: pass video scaling param to CCodecConfig

Bug: 331913507
Bug: 34159087
Test: manual
Test: presubmit
Change-Id: I6ce9b39e4850bea0ad7259d48ef289395917bce4

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index ca0aabb..39aadd7 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -2633,6 +2633,15 @@
     if (config->mInputSurface == nullptr
             && (property_get_bool("debug.stagefright.ccodec_delayed_params", false)
                     || comp->getName().find("c2.android.") == 0)) {
+        std::vector<std::unique_ptr<C2Param>> localConfigUpdate;
+        for (const std::unique_ptr<C2Param> &param : configUpdate) {
+            if (param && param->coreIndex().coreIndex() == C2StreamSurfaceScalingInfo::CORE_INDEX) {
+                localConfigUpdate.push_back(C2Param::Copy(*param));
+            }
+        }
+        if (!localConfigUpdate.empty()) {
+            (void)config->setParameters(comp, localConfigUpdate, C2_MAY_BLOCK);
+        }
         mChannel->setParameters(configUpdate);
     } else {
         sp<AMessage> outputFormat = config->mOutputFormat;