diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 18:25:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-11 18:25:28 -0700 |
| commit | 2fd313002a0e987ac01c037d5357e1572c4522c6 (patch) | |
| tree | 9cde09bbe7dfec9ba7f87608cc72afedbde2bba3 /services | |
| parent | c4cb95449426b5715c6f737abb7eb95945f87166 (diff) | |
| parent | efd69bc6740cb20a9d8bf58ecdf16f411573c100 (diff) | |
| download | frameworks_av-2fd313002a0e987ac01c037d5357e1572c4522c6.zip frameworks_av-2fd313002a0e987ac01c037d5357e1572c4522c6.tar.gz frameworks_av-2fd313002a0e987ac01c037d5357e1572c4522c6.tar.bz2 | |
Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/ZslProcessor.cpp | 7 |
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 ¶ms) { 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 ¶ms) { 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) { |