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

Commit fff97293 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android Git Automerger
Browse files

am cb66d22f: Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc... 

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

* commit 'cb66d22f':
  Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.
parents 660b7ad3 cb66d22f

services/camera/libcameraservice/camera2/ZslProcessor.cpp

+1 −1
Original line number Original line 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

        // TODO: Sort out better way to select resolution for ZSL

        res = device->createStream(mZslWindow,

        res = device->createStream(mZslWindow,

                params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,

                params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,

                HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 0,

                CAMERA2_HAL_PIXEL_FORMAT_ZSL, 0,

                &mZslStreamId);

                &mZslStreamId);

        if (res != OK) {

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't create output stream for ZSL: "

            ALOGE("%s: Camera %d: Can't create output stream for ZSL: "