commit c81c12cb3a1001043fd9709193bb2ca00d9ef6f2
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 09 11:34:23 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 09 11:34:23 2014 -0700
tree 125ca96b8594503d7a68c63ad96e9e746bcb34f2
parent 8f4e1a68ba5852b02a1810f9ceee735e59d669b2
parent 190dc1cc91a059c8e553abeff52768c5f657a728

Merge "hwc: modifying logic in adjust FB Z-order for 4k2kYUVSplit"

libgralloc/alloc_controller.cpp

diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index 77c9922..7255391 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -181,6 +181,7 @@
     } else {
         switch (format)
         {
+            case HAL_PIXEL_FORMAT_YCrCb_420_SP:
             case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
             case HAL_PIXEL_FORMAT_RAW_SENSOR:
                 aligned_w = ALIGN(width, 32);
@@ -189,7 +190,6 @@
                 aligned_w = ALIGN(width, 128);
                 break;
             case HAL_PIXEL_FORMAT_YCbCr_420_SP:
-            case HAL_PIXEL_FORMAT_YCrCb_420_SP:
             case HAL_PIXEL_FORMAT_YV12:
             case HAL_PIXEL_FORMAT_YCbCr_422_SP:
             case HAL_PIXEL_FORMAT_YCrCb_422_SP: