commit a4ce38da87d4a7752329914d6cc888efe844ca35
author Vineeta Srivastava <vsrivastava@google.com> Tue Jun 23 19:01:52 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 23 19:01:53 2015 +0000
tree 635b7865845c146a02e93c1b8625e785d66b9688
parent d6e36fa315e667055d8f51fcbf9b496737636d60
parent f115dae0b900cf6dfbed0efc68466e6e935af2f0

Merge "gralloc: Add Raw10 support in allocator" into mnc-dev

msm8994/libgralloc/alloc_controller.cpp

diff --git a/msm8994/libgralloc/alloc_controller.cpp b/msm8994/libgralloc/alloc_controller.cpp
index af2c55e..b501863 100644
--- a/msm8994/libgralloc/alloc_controller.cpp
+++ b/msm8994/libgralloc/alloc_controller.cpp
@@ -160,6 +160,9 @@
     {
         case HAL_PIXEL_FORMAT_YCrCb_420_SP:
         case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
+        case HAL_PIXEL_FORMAT_RAW10:
+            aligned_w = ALIGN(width * 10 /8, 16);
+            break;
         case HAL_PIXEL_FORMAT_RAW16:
             aligned_w = ALIGN(width, 32);
             break;
@@ -475,10 +478,12 @@
         case HAL_PIXEL_FORMAT_RGB_565:
         case HAL_PIXEL_FORMAT_RGBA_5551:
         case HAL_PIXEL_FORMAT_RGBA_4444:
+        case HAL_PIXEL_FORMAT_RAW10:
+            size = ALIGN(alignedw * alignedh, 4096);
+            break;
         case HAL_PIXEL_FORMAT_RAW16:
             size = alignedw * alignedh * 2;
             break;
-
             // adreno formats
         case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:  // NV21
             size  = ALIGN(alignedw*alignedh, 4096);
@@ -643,6 +648,7 @@
         case HAL_PIXEL_FORMAT_YCrCb_422_SP:
         case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
         case HAL_PIXEL_FORMAT_NV21_ZSL:
+        case HAL_PIXEL_FORMAT_RAW10:
         case HAL_PIXEL_FORMAT_RAW16:
             ystride = cstride = hnd->width;
             ycbcr->y  = (void*)hnd->base;