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

Commit 60a3c31e authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "CCodec: pass video scaling param to CCodecConfig" into main am: cbef7606 

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



Change-Id: I31342774bba0a57cbd2ee0c02f56cff3724f3297
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b68eb61 cbef7606

media/codec2/sfplugin/CCodec.cpp

+9 −0
Original line number Diff line number Diff line
@@ -2633,6 +2633,15 @@ void CCodec::signalSetParameters(const sp<AMessage> &msg) { 
    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;