commit 9d4828909c12ceace2c613d8bc9a5524749086cc
author Tao Wu <lepton@google.com> Fri Sep 15 02:28:41 2023 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri Sep 15 02:28:41 2023 +0000
tree e59c3a640d8a02ff9e79fe96ed0105d4c6af7a87
parent 181402d5da1cc1b2a52259e5a290788e27612985

C2AllocatorGralloc: Resolve implementation defined format.

Try to use getPixelFormatFourCC to get the actual format for
implementation defined format.

Bug: 259508084
Test: manual - run vivo class app
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e40047c6faa87e9e515d26f18580f76b59267132)
Merged-In: I8070d64a90ab14c700419399c71001a41e6e8938
Change-Id: I8070d64a90ab14c700419399c71001a41e6e8938

media/codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/media/codec2/vndk/C2AllocatorGralloc.cpp b/media/codec2/vndk/C2AllocatorGralloc.cpp
index f272499..0803dc3 100644
--- a/media/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/media/codec2/vndk/C2AllocatorGralloc.cpp
@@ -23,6 +23,7 @@
 #include <aidl/android/hardware/graphics/common/PlaneLayoutComponentType.h>
 #include <android/hardware/graphics/common/1.2/types.h>
 #include <cutils/native_handle.h>
+#include <drm/drm_fourcc.h>
 #include <gralloctypes/Gralloc4.h>
 #include <hardware/gralloc.h>
 #include <ui/GraphicBufferAllocator.h>
@@ -478,7 +479,25 @@
     // 'NATIVE' on Android means LITTLE_ENDIAN
     constexpr C2PlaneInfo::endianness_t kEndianness = C2PlaneInfo::NATIVE;
 
-    switch (mFormat) {
+    // Try to resolve IMPLEMENTATION_DEFINED format to accurate format if
+    // possible.
+    uint32_t format = mFormat;
+    uint32_t fourCc;
+    if (format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED &&
+        !GraphicBufferMapper::get().getPixelFormatFourCC(mBuffer, &fourCc)) {
+        switch (fourCc)  {
+            case DRM_FORMAT_XBGR8888:
+                 format = static_cast<uint32_t>(PixelFormat4::RGBX_8888);
+                 break;
+            case DRM_FORMAT_ABGR8888:
+                 format = static_cast<uint32_t>(PixelFormat4::RGBA_8888);
+                 break;
+            default:
+                 break;
+        }
+    }
+
+    switch (format) {
         case static_cast<uint32_t>(PixelFormat4::RGBA_1010102): {
             // TRICKY: this is used for media as YUV444 in the case when it is queued directly to a
             // Surface. In all other cases it is RGBA. We don't know which case it is here, so