diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-17 11:09:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-17 11:09:21 -0700 |
| commit | 98bc0b929c682adb59595688d5b87081218eaa3c (patch) | |
| tree | 0c7f07428cf03a49f17cf8eea6ed6773c5becb3a | |
| parent | 8c5372ed6644b800932dbef4aedb6add6c8c5661 (diff) | |
| parent | 92908745a52989339dc5b9ebf3d402607ea09b24 (diff) | |
| download | frameworks_av-98bc0b929c682adb59595688d5b87081218eaa3c.zip frameworks_av-98bc0b929c682adb59595688d5b87081218eaa3c.tar.gz frameworks_av-98bc0b929c682adb59595688d5b87081218eaa3c.tar.bz2 | |
am 92908745: am b845c6b0: Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""" into jb-mr1-dev
* commit '92908745a52989339dc5b9ebf3d402607ea09b24':
Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""
| -rw-r--r-- | services/camera/libcameraservice/camera2/ZslProcessor.cpp | 2 |
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 ¶ms) { // 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: " |