summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-13 16:29:45 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-09-13 16:43:35 -0700
commit8a3016613dc684a6be11fdf643f9cc5cad817e8f (patch)
treebffddba5ecc9040f07ae0a465cb7a1da5a31e6a8 /services
parent66466087f464b641c8c09b195891a9713a554900 (diff)
downloadframeworks_av-8a3016613dc684a6be11fdf643f9cc5cad817e8f.zip
frameworks_av-8a3016613dc684a6be11fdf643f9cc5cad817e8f.tar.gz
frameworks_av-8a3016613dc684a6be11fdf643f9cc5cad817e8f.tar.bz2
Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.
Until all HAL implementations move to the new format negotiation scheme, use CAMERA2_HAL_PIXEL_FORMAT_ZSL to indicate ZSL mode. Bug: 6243944 Change-Id: Idf5d9f42e203903ba906d5df156100646b27404c
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/camera2/ZslProcessor.cpp2
1 files changed, 1 insertions, 1 deletions
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 @@ status_t ZslProcessor::updateStream(const Parameters &params) {
// 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: "