commit fbe96d2b78f7c33eaaf45fecd102807e1552e3dc
author Jesse Hall <jessehall@google.com> Fri Sep 20 01:39:43 2013 -0700
committer Arun Kumar K.R <akumarkr@codeaurora.org> Fri Nov 08 15:23:10 2013 -0800
tree c7e688ef0afe9c8f7c80e6c574deb4be67715fda
parent 82fc4b733f0893b2ee9c0174559221dd4505af07

Replace sRGB_888 with sRGB_X_8888

As sRGB_888 is not defined, replace it with sRGB_X_8888

Change-Id: Ie7e27ffea1ca6ec99de8e746c0f784e5fc9a4e53
(cherry picked from commit b81796dc9a0c4178004ae947e9d756c5cae6967a)

libgralloc/alloc_controller.cpp

diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index 5a6fe6e..06ce156 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -104,7 +104,7 @@
 {
     int stride = ALIGN(width, 32);
     // Currently surface padding is only computed for RGB* surfaces.
-    if (format <= HAL_PIXEL_FORMAT_sRGB_888) {
+    if (format <= HAL_PIXEL_FORMAT_sRGB_X_8888) {
         // Don't add any additional padding if debug.gralloc.map_fb_memory
         // is enabled
         char property[PROPERTY_VALUE_MAX];
@@ -118,7 +118,6 @@
         switch(format)
         {
             case HAL_PIXEL_FORMAT_RGB_888:
-            case HAL_PIXEL_FORMAT_sRGB_888:
                 bpp = 3;
                 break;
             case HAL_PIXEL_FORMAT_RGB_565:
@@ -282,10 +281,10 @@
         case HAL_PIXEL_FORMAT_RGBX_8888:
         case HAL_PIXEL_FORMAT_BGRA_8888:
         case HAL_PIXEL_FORMAT_sRGB_A_8888:
+        case HAL_PIXEL_FORMAT_sRGB_X_8888:
             size = alignedw * alignedh * 4;
             break;
         case HAL_PIXEL_FORMAT_RGB_888:
-        case HAL_PIXEL_FORMAT_sRGB_888:
             size = alignedw * alignedh * 3;
             break;
         case HAL_PIXEL_FORMAT_RGB_565:

libgralloc/gpu.cpp

diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index 2b123dd..eb19f89 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -173,7 +173,7 @@
 {
     *bufferType = BUFFER_TYPE_VIDEO;
 
-    if (inputFormat <= HAL_PIXEL_FORMAT_sRGB_888) {
+    if (inputFormat <= HAL_PIXEL_FORMAT_sRGB_X_8888) {
         // RGB formats
         *bufferType = BUFFER_TYPE_UI;
     } else if ((inputFormat == HAL_PIXEL_FORMAT_R_8) ||