Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92908745 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am b845c6b0: Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition... 

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

* commit 'b845c6b0':
  Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""
parents d31bdeca b845c6b0

services/camera/libcameraservice/camera2/ZslProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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: "