commit a484fe215059e8c927cdbbec7d5c9683962d8f9b
author Mathias Agopian <mathias@google.com> Wed Jul 14 16:30:21 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 14 16:30:21 2010 -0700
tree a850323b90feefdbe15f23f269a0fb7d3bec7d63
parent 68670eb7b66ce2b71205ed68457b6fb5ee9fe552
parent 4248ce329aa5164322acb15be20cbf32648a9790

Merge "Remove the YV16 format." into gingerbread

libgralloc-qsd8k/gpu.cpp

diff --git a/libgralloc-qsd8k/gpu.cpp b/libgralloc-qsd8k/gpu.cpp
index 2a2d6d5..bcca1eb 100644
--- a/libgralloc-qsd8k/gpu.cpp
+++ b/libgralloc-qsd8k/gpu.cpp
@@ -240,14 +240,9 @@
 
         case HAL_PIXEL_FORMAT_YV12:
             alignedw = ALIGN(w, 16);
-            alignedh = ALIGN(h, 16);
-            size  = alignedw * alignedh;
-            size += size / 2;
-            break;
-
-        case HAL_PIXEL_FORMAT_YV16:
-            alignedh = ALIGN(h, 16);
-            size = alignedw * alignedh * 2;
+            alignedh = ALIGN(h,  2);
+            size = alignedw*alignedh +
+                    (ALIGN(alignedw/2, 16) * (alignedh/2))*2;
             break;
 
         default: