commit b845c6b0c3066d6791973be830f0953477461a65
author Eino-Ville Talvala <etalvala@google.com> Fri Sep 14 12:10:07 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 14 12:10:07 2012 -0700
tree 293ddb2751ef25614f2395d722020299d1dd0ccd
parent e44e90c82d75b806e89f751a61dc7e54d0144338
parent beb1416afd1d331b8e7e93d626f39267acce289a

Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""" into jb-mr1-dev

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: "