commit 49ea151b481bfb397d74850dbf2a6fba935c33ca
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Sep 11 21:34:11 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Sep 11 21:34:11 2022 +0000
tree 75d3e1fac12f70abab5fdec6cd7767696957e5f2
parent 3b7f0cc11d8f64efa5f5ad44ea871042ac6d9db4
parent 477ac28002a547ac001a1374134f2e6535f9e471

Snap for 9050763 from 477ac28002a547ac001a1374134f2e6535f9e471 to mainline-mediaprovider-release

Change-Id: I1bf3fff0bcfebbb31cd44c3f54867a9f9772d7ad

media/codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/media/codec2/vndk/C2AllocatorGralloc.cpp b/media/codec2/vndk/C2AllocatorGralloc.cpp
index a4a9b3a..f272499 100644
--- a/media/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/media/codec2/vndk/C2AllocatorGralloc.cpp
@@ -706,6 +706,14 @@
         }
 
         case static_cast<uint32_t>(PixelFormat4::YCBCR_P010): {
+            // In Android T, P010 is relaxed to allow arbitrary stride for the Y and UV planes,
+            // try locking with the gralloc4 mapper first.
+            c2_status_t status = Gralloc4Mapper_lock(
+                    const_cast<native_handle_t*>(mBuffer), grallocUsage, rect, layout, addr);
+            if (status == C2_OK) {
+                break;
+            }
+
             void *pointer = nullptr;
             status_t err = GraphicBufferMapper::get().lock(
                     const_cast<native_handle_t *>(mBuffer), grallocUsage, rect, &pointer);