commit 1901fa371a67081fd46b2e44e8ecd7e4b3575a37
author Naseer Ahmed <naseer@codeaurora.org> Wed Mar 22 20:34:45 2017 -0400
committer Naseer Ahmed <naseer@codeaurora.org> Wed Mar 22 22:15:11 2017 -0400
tree 57b763a152d67a8755e05a224620b2ee0ee44792
parent 7df1e404ad9d0de80eeedcb30cbd9bd71fbed7e6

gralloc1: Handle ZSL scenario

Per camera team, if both producer and consumer camera flags are
set, the format should be ZSL.

CRs-Fixed: 2023560
Change-Id: Iecc168047acf36b267068cb8d2e764a7b891f430

libgralloc1/gr_allocator.cpp

diff --git a/libgralloc1/gr_allocator.cpp b/libgralloc1/gr_allocator.cpp
index 577819c..9a46115 100644
--- a/libgralloc1/gr_allocator.cpp
+++ b/libgralloc1/gr_allocator.cpp
@@ -455,7 +455,12 @@
     } else if (cons_usage & GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER) {
       gr_format = HAL_PIXEL_FORMAT_NV12_ENCODEABLE;  // NV12
     } else if (cons_usage & GRALLOC1_CONSUMER_USAGE_CAMERA) {
-      gr_format = HAL_PIXEL_FORMAT_YCrCb_420_SP;  // NV21
+      if (prod_usage & GRALLOC1_PRODUCER_USAGE_CAMERA) {
+        // Assumed ZSL if both producer and consumer camera flags set
+        gr_format = HAL_PIXEL_FORMAT_NV21_ZSL;  // NV21
+      } else {
+        gr_format = HAL_PIXEL_FORMAT_YCrCb_420_SP;  // NV21
+      }
     } else if (prod_usage & GRALLOC1_PRODUCER_USAGE_CAMERA) {
       if (format == HAL_PIXEL_FORMAT_YCbCr_420_888) {
         gr_format = HAL_PIXEL_FORMAT_NV21_ZSL;  // NV21