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

Commit 7fe6ac0d authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev

parents 19cb41fb 05bbae99

services/camera/libcameraservice/camera2/Parameters.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1844,13 +1844,14 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { 
            CropRegion::OUTPUT_PREVIEW     |

            CropRegion::OUTPUT_VIDEO       |

            CropRegion::OUTPUT_PICTURE    ));

    int32_t reqCropRegion[3] = {

    int32_t reqCropRegion[4] = {

        static_cast<int32_t>(crop.left),

        static_cast<int32_t>(crop.top),

        static_cast<int32_t>(crop.width)

        static_cast<int32_t>(crop.width),

        static_cast<int32_t>(crop.height)

    };

    res = request->update(ANDROID_SCALER_CROP_REGION,

            reqCropRegion, 3);

            reqCropRegion, 4);

    if (res != OK) return res;



    uint8_t reqVstabMode = videoStabilization ?