commit fac9b61a05e2143c877474ce3e2a3a47803ed799
author Igor Murashkin <iam@google.com> Mon Sep 17 10:28:44 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 17 10:28:44 2012 -0700
tree e2598ac19944819d244a464a3e7683840bec071c
parent 7d53ee95532f3105d2d2bf602c3ad20795ab81bc
parent fff97293d56ca9869004f89ce46c2b337d7f57e7

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

* commit 'fff97293d56ca9869004f89ce46c2b337d7f57e7':
  Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.

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