commit 4de16e73025bca0d8a094576ebff973319ec4ba4
author Dan Stoza <stoza@google.com> Fri Jan 08 19:54:55 2016 +0000
committer Dan Stoza <stoza@google.com> Fri Jan 08 19:54:55 2016 +0000
tree 4d7e398d89f5a6a796f4078362701b6db7f61bff
parent 8c953e45f3431f8e1c04f8973fe8bdebf7e61033

Revert "libstagefright: Remove direct access to gralloc"

This reverts commit 8c953e45f3431f8e1c04f8973fe8bdebf7e61033.

Change-Id: I83b3a7c3edf565cb62ea50332025558b5ea3bf2e

media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp

diff --git a/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
index 72823e2..a770f49 100644
--- a/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
+++ b/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
@@ -23,6 +23,7 @@
 
 #include "include/SoftVideoEncoderOMXComponent.h"
 
+#include <hardware/gralloc.h>
 #include <media/hardware/HardwareAPI.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <media/stagefright/foundation/ALooper.h>
@@ -70,6 +71,7 @@
       mBitrate(192000),
       mFramerate(30 << 16), // Q16 format
       mColorFormat(OMX_COLOR_FormatYUV420Planar),
+      mGrallocModule(NULL),
       mMinOutputBufferSize(384), // arbitrary, using one uncompressed macroblock
       mMinCompressionRatio(1),   // max output size is normally the input size
       mComponentRole(componentRole),
@@ -498,6 +500,13 @@
         return NULL;
     }
 
+    if (mGrallocModule == NULL) {
+        CHECK_EQ(0, hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &mGrallocModule));
+    }
+
+    const gralloc_module_t *grmodule =
+        (const gralloc_module_t *)mGrallocModule;
+
     buffer_handle_t handle;
     int format;
     size_t srcStride;
@@ -555,21 +564,19 @@
         return NULL;
     }
 
-    auto& mapper = GraphicBufferMapper::get();
-
     void *bits = NULL;
     struct android_ycbcr ycbcr;
     status_t res;
     if (format == HAL_PIXEL_FORMAT_YCbCr_420_888) {
-        res = mapper.lockYCbCr(
-                 handle,
+        res = grmodule->lock_ycbcr(
+                 grmodule, handle,
                  GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_NEVER,
-                 Rect(width, height), &ycbcr);
+                 0, 0, width, height, &ycbcr);
     } else {
-        res = mapper.lock(
-                 handle,
+        res = grmodule->lock(
+                 grmodule, handle,
                  GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_NEVER,
-                 Rect(width, height), &bits);
+                 0, 0, width, height, &bits);
     }
     if (res != OK) {
         ALOGE("Unable to lock image buffer %p for access", handle);
@@ -613,7 +620,7 @@
             break;
     }
 
-    if (mapper.unlock(handle) != OK) {
+    if (grmodule->unlock(grmodule, handle) != OK) {
         ALOGE("Unable to unlock image buffer %p for access", handle);
     }