commit 65f16566210422e4fd3b7e6bbedaae22d67fc281
author Naseer Ahmed <naseer@codeaurora.org> Fri Jun 15 20:53:42 2012 -0700
committer Iliyan Malchev <malchev@google.com> Thu Jun 21 16:31:57 2012 -0700
tree 5620f04413401b9e8d127f85cfe14b4de5d7aee4
parent 29a26818d7294055539167b2fbfdaa168bcf725c

gralloc: Update YUV420 SP tiled format to match OMX

The value of OMX color format for YUV 420 SP tiled is 0x7FA30C03.
Add this format and also remove masking for interlaced videos
and S3D which were causing the format to be masked incorrectly

Change-Id: I76fe5e6e00a36130b065c5d88a8f52eebcfa162b

libgralloc/gpu.cpp

diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index 0ec8d73..4f00e4a 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -176,15 +176,7 @@
     *bufferType = BUFFER_TYPE_VIDEO;
     *colorFormat = inputFormat;
 
-    if (inputFormat == HAL_PIXEL_FORMAT_YV12) {
-        *bufferType = BUFFER_TYPE_VIDEO;
-    } else if (inputFormat & S3D_FORMAT_MASK) {
-        // S3D format
-        *colorFormat = COLOR_FORMAT(inputFormat);
-    } else if (inputFormat & INTERLACE_MASK) {
-        // Interlaced
-        *colorFormat = inputFormat ^ HAL_PIXEL_FORMAT_INTERLACE;
-    } else if (inputFormat < 0x7) {
+    if (inputFormat < 0x7) {
         // RGB formats
         *colorFormat = inputFormat;
         *bufferType = BUFFER_TYPE_UI;

libgralloc/gralloc_priv.h

diff --git a/libgralloc/gralloc_priv.h b/libgralloc/gralloc_priv.h
index 846a611..c38ed79 100644
--- a/libgralloc/gralloc_priv.h
+++ b/libgralloc/gralloc_priv.h
@@ -105,8 +105,8 @@
 /*****************************************************************************/
 enum {
     /* OEM specific HAL formats */
-    HAL_PIXEL_FORMAT_NV12_ENCODEABLE  = 0x102,
-    HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED     = 0x108,
+    HAL_PIXEL_FORMAT_NV12_ENCODEABLE        = 0x102,
+    HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED     = 0x7FA30C03,
     HAL_PIXEL_FORMAT_YCbCr_420_SP           = 0x109,
     HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO    = 0x10A,
     HAL_PIXEL_FORMAT_YCrCb_422_SP           = 0x10B,