commit df9f7fd80a46031e68a527db77f71e253104a449
author David Stevens <stevensd@google.com> Fri May 01 07:23:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 01 07:23:31 2020 +0000
tree a5c69e71b1bc3fb7630952d8c49cebe8006e518d
parent efbd9763867e43fee9fcdf1bc29462da7d320dfc
parent cd769b3f4f0585682c57eb8dc876005ae00c673e

Merge "codec2: Fix linear gralloc blobs" into rvc-dev am: d714ed75cf am: cd769b3f4f

Change-Id: Iaf6b29a190be27c27fce4d766da9535968264fc5

media/codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/media/codec2/vndk/C2AllocatorGralloc.cpp b/media/codec2/vndk/C2AllocatorGralloc.cpp
index 3ac3d89..e1e1377 100644
--- a/media/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/media/codec2/vndk/C2AllocatorGralloc.cpp
@@ -520,6 +520,22 @@
             break;
         }
 
+        case static_cast<uint32_t>(PixelFormat4::BLOB): {
+            void *pointer = nullptr;
+            // TODO: fence
+            status_t err = GraphicBufferMapper::get().lock(
+                                const_cast<native_handle_t*>(mBuffer), grallocUsage,
+                                { (int32_t)rect.left, (int32_t)rect.top,
+                                  (int32_t)rect.width, (int32_t)rect.height },
+                                &pointer);
+            if (err) {
+                ALOGE("failed transaction: lock(BLOB)");
+                return C2_CORRUPTED;
+            }
+            *addr = (uint8_t *)pointer;
+            break;
+        }
+
         case static_cast<uint32_t>(PixelFormat4::YCBCR_420_888):
             // fall-through
         case static_cast<uint32_t>(PixelFormat4::YV12):