summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-11 17:23:48 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-09-11 17:23:48 -0700
commitefd69bc6740cb20a9d8bf58ecdf16f411573c100 (patch)
tree327d8efa14dc8be4eca91862ec49d9d23d14f2d1 /services/camera
parentc33e4b59c48aff4c531ba33d03066b0fe101b8bf (diff)
downloadframeworks_av-efd69bc6740cb20a9d8bf58ecdf16f411573c100.zip
frameworks_av-efd69bc6740cb20a9d8bf58ecdf16f411573c100.tar.gz
frameworks_av-efd69bc6740cb20a9d8bf58ecdf16f411573c100.tar.bz2
Camera2: Use full pixel array for ZSL stream
For efficiency, use full pixel array size for the ZSL output/input streams, instead of the final picture size. Bug: 7139362 Change-Id: I98ad4f5a1ca283efe87ae60bf0cf39573e22d2f3
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/camera2/ZslProcessor.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/camera2/ZslProcessor.cpp b/services/camera/libcameraservice/camera2/ZslProcessor.cpp
index ea1c2b9..0771872 100644
--- a/services/camera/libcameraservice/camera2/ZslProcessor.cpp
+++ b/services/camera/libcameraservice/camera2/ZslProcessor.cpp
@@ -132,8 +132,8 @@ status_t ZslProcessor::updateStream(const Parameters &params) {
client->getCameraId(), strerror(-res), res);
return res;
}
- if (currentWidth != (uint32_t)params.pictureWidth ||
- currentHeight != (uint32_t)params.pictureHeight) {
+ if (currentWidth != (uint32_t)params.fastInfo.arrayWidth ||
+ currentHeight != (uint32_t)params.fastInfo.arrayHeight) {
res = device->deleteReprocessStream(mZslReprocessStreamId);
if (res != OK) {
ALOGE("%s: Camera %d: Unable to delete old reprocess stream "
@@ -154,8 +154,9 @@ status_t ZslProcessor::updateStream(const Parameters &params) {
if (mZslStreamId == NO_STREAM) {
// Create stream for HAL production
+ // TODO: Sort out better way to select resolution for ZSL
res = device->createStream(mZslWindow,
- params.pictureWidth, params.pictureHeight,
+ params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 0,
&mZslStreamId);
if (res != OK) {