commit 508118814a59b255b8ff1048461f83465089785b
author Wonsik Kim <wonsik@google.com> Thu Apr 28 15:57:27 2022 -0700
committer Wonsik Kim <wonsik@google.com> Thu Apr 28 15:57:27 2022 -0700
tree 11f32f9b2e7128e3eb288463097cf5f29323e2ec
parent 595156f1878a349b60eac20e7358fe9429564a04

CCodec: enable vendor-flex format for vendor SDK level >= S

Bug: 216698909
Test: atest android.video.cts.VideoEncoderDecoderTest#testAvcGoog0Qual0320x0240
Change-Id: I4569e30397853bedb21a0e78b3e173d1928223d5

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 3302dd3..c1c49cb 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -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>
@@ -1006,7 +1007,9 @@
             // 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,