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

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

Merge "CCodec: fix update pixelFormatInfo for pre-S" am: b99b4cf2 

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



Change-Id: I2092eb9c89e5e8a931f66e64d6528eb8e7816073
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40b25026 b99b4cf2

media/codec2/sfplugin/CCodec.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1014,7 +1014,7 @@ void CCodec::configure(const sp<AMessage> &msg) { 
            C2StoreFlexiblePixelFormatDescriptorsInfo *pixelFormatInfo = nullptr;

            C2StoreFlexiblePixelFormatDescriptorsInfo *pixelFormatInfo = nullptr;

            int vendorSdkVersion = base::GetIntProperty(

            int vendorSdkVersion = base::GetIntProperty(

                    "ro.vendor.build.version.sdk", android_get_device_api_level());

                    "ro.vendor.build.version.sdk", android_get_device_api_level());

            if (vendorSdkVersion >= __ANDROID_API_S__ && mClient->query(

            if (mClient->query(

                        {},

                        {},

                        {C2StoreFlexiblePixelFormatDescriptorsInfo::PARAM_TYPE},

                        {C2StoreFlexiblePixelFormatDescriptorsInfo::PARAM_TYPE},

                        C2_MAY_BLOCK,

                        C2_MAY_BLOCK,