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

Commit 64e732d6 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "CCodec: enable vendor-flex format for vendor SDK level >= S" into... 

Merge "CCodec: enable vendor-flex format for vendor SDK level >= S" into tm-dev am: d093bb08 am: 4eb49f21 am: 7600b7fd am: e2a0cfde

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



Change-Id: Idbe92cb3a70a34ee56f4e2df6852036844872be4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7a12394 e2a0cfde

media/codec2/sfplugin/CCodec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <android/hardware/media/c2/1.0/IInputSurface.h>

#include <android/hardware/media/omx/1.0/IGraphicBufferSource.h>

#include <android/hardware/media/omx/1.0/IOmx.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <cutils/properties.h>

#include <gui/IGraphicBufferProducer.h>
@@ -1011,7 +1012,9 @@ void CCodec::configure(const sp<AMessage> &msg) { 
            // Query vendor format for Flexible YUV

            std::vector<std::unique_ptr<C2Param>> heapParams;

            C2StoreFlexiblePixelFormatDescriptorsInfo *pixelFormatInfo = nullptr;

            if (mClient->query(

            int vendorSdkVersion = base::GetIntProperty(

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

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

                        {},

                        {C2StoreFlexiblePixelFormatDescriptorsInfo::PARAM_TYPE},

                        C2_MAY_BLOCK,