commit 9c043caec3b1a7bf08e9e0fb437ea8f3c2e30cea
author Shuzhen Wang <shuzhenw@codeaurora.org> Wed Apr 02 16:26:43 2014 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Fri Apr 04 22:51:39 2014 +0000
tree 852e2057772c2b12b08f1ad612e3da9288f4b990
parent 9116e9d912b4c3b772fd8d0ed224056488337271

gralloc: Add opaque raw and raw16 supports

Bug: 13769626

Change-Id: I85a48edc992e7e1f1a814940e4ef8ea120514dec

msm8960/libgralloc/alloc_controller.cpp

diff --git a/msm8960/libgralloc/alloc_controller.cpp b/msm8960/libgralloc/alloc_controller.cpp
index 16a908b..eadc5b8 100644
--- a/msm8960/libgralloc/alloc_controller.cpp
+++ b/msm8960/libgralloc/alloc_controller.cpp
@@ -130,7 +130,6 @@
         switch (format)
         {
             case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
-            case HAL_PIXEL_FORMAT_RAW_SENSOR:
                 stride = ALIGN(width, 32);
                 break;
             case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
@@ -142,6 +141,8 @@
             case HAL_PIXEL_FORMAT_YV12:
             case HAL_PIXEL_FORMAT_YCbCr_422_SP:
             case HAL_PIXEL_FORMAT_YCrCb_422_SP:
+            case HAL_PIXEL_FORMAT_RAW16:
+            case HAL_PIXEL_FORMAT_RAW_OPAQUE:
                 stride = ALIGN(width, 16);
                 break;
             case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
@@ -269,7 +270,8 @@
             size = alignedw * alignedh * 3;
             break;
         case HAL_PIXEL_FORMAT_RGB_565:
-        case HAL_PIXEL_FORMAT_RAW_SENSOR:
+        case HAL_PIXEL_FORMAT_RAW16:
+        case HAL_PIXEL_FORMAT_RAW_OPAQUE:
             size = alignedw * alignedh * 2;
             break;
 

msm8974/libgralloc/alloc_controller.cpp

diff --git a/msm8974/libgralloc/alloc_controller.cpp b/msm8974/libgralloc/alloc_controller.cpp
index bda3dfd..ddf1bdc 100644
--- a/msm8974/libgralloc/alloc_controller.cpp
+++ b/msm8974/libgralloc/alloc_controller.cpp
@@ -139,7 +139,6 @@
         switch (format)
         {
             case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
-            case HAL_PIXEL_FORMAT_RAW_SENSOR:
                 stride = ALIGN(width, 32);
                 break;
             case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
@@ -150,6 +149,8 @@
             case HAL_PIXEL_FORMAT_YV12:
             case HAL_PIXEL_FORMAT_YCbCr_422_SP:
             case HAL_PIXEL_FORMAT_YCrCb_422_SP:
+            case HAL_PIXEL_FORMAT_RAW16:
+            case HAL_PIXEL_FORMAT_RAW_OPAQUE:
                 stride = ALIGN(width, 16);
                 break;
             case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
@@ -288,7 +289,8 @@
             size = alignedw * alignedh * 3;
             break;
         case HAL_PIXEL_FORMAT_RGB_565:
-        case HAL_PIXEL_FORMAT_RAW_SENSOR:
+        case HAL_PIXEL_FORMAT_RAW16:
+        case HAL_PIXEL_FORMAT_RAW_OPAQUE:
             size = alignedw * alignedh * 2;
             break;