commit d697d5c780b61d121249c51eeddd4b36cae877fb
author Eino-Ville Talvala <etalvala@google.com> Fri Sep 14 11:37:13 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 14 11:37:13 2012 -0700
tree 361325889a328603194423eb396890b922467665
parent b362ce8130a345c3675f985e00411bb8fcbdc55e

Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""

The changes this commit depends on are now submitted.

This reverts commit f54b1459cda7f585b4896671643b33bab8290964

Change-Id: If7f146ab7968d50fffd2174c2c5792bdc9d7724c

services/camera/libcameraservice/camera2/ZslProcessor.cpp

diff --git a/services/camera/libcameraservice/camera2/ZslProcessor.cpp b/services/camera/libcameraservice/camera2/ZslProcessor.cpp
index 58e820c..f17b5d3 100644
--- a/services/camera/libcameraservice/camera2/ZslProcessor.cpp
+++ b/services/camera/libcameraservice/camera2/ZslProcessor.cpp
@@ -157,7 +157,7 @@
         // TODO: Sort out better way to select resolution for ZSL
         res = device->createStream(mZslWindow,
                 params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,
-                HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 0,
+                CAMERA2_HAL_PIXEL_FORMAT_ZSL, 0,
                 &mZslStreamId);
         if (res != OK) {
             ALOGE("%s: Camera %d: Can't create output stream for ZSL: "