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

Commit d067489a authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-dev

parents 2552036a 6e4db898

services/camera/libcameraservice/camera2/ZslProcessor.cpp

+4 −3
Original line number Diff line number Diff line
@@ -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) {