| commit | 688fb86f489a98d2cd8e78ebcafd5677d3a0f655 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Nov 17 10:36:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 17 10:36:46 2022 +0000 |
| tree | 3b48132ce545e0cddf38c967202bad6d89673ccb | |
| parent | 841185d1e6b63554ea03743ca880f844690d8f6a [diff] | |
| parent | 959c7d4d996118f14743af074579c65f4e0cd123 [diff] |
Merge "CCodec: fix update pixelFormatInfo for pre-S" am: b99b4cf29c am: 1151839382 am: 959c7d4d99 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2266911 Change-Id: Id659e0e02f341865e7f09357796df936d8d94fe8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp index bdc4828..a008dc2 100644 --- a/media/codec2/sfplugin/CCodec.cpp +++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1014,7 +1014,7 @@ C2StoreFlexiblePixelFormatDescriptorsInfo *pixelFormatInfo = nullptr; int vendorSdkVersion = base::GetIntProperty( "ro.vendor.build.version.sdk", android_get_device_api_level()); - if (vendorSdkVersion >= __ANDROID_API_S__ && mClient->query( + if (mClient->query( {}, {C2StoreFlexiblePixelFormatDescriptorsInfo::PARAM_TYPE}, C2_MAY_BLOCK,