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

Commit 318ba174 authored by Nobuo, Ishii X's avatar Nobuo, Ishii X Committed by android-build-merger
Browse files

Merge "Camera: Correct ae regions request for metering area" am: f402866c 

am: b9449281

Change-Id: I225bb33f61e34baaf3e52bd026bedf13b6e3ad16
parents 088db676 b9449281

services/camera/libcameraservice/api1/client2/Parameters.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2200,6 +2200,14 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { 
                normalizedXToArray(meteringAreas[j].right);

            reqMeteringAreas[i + 3] =

                normalizedYToArray(meteringAreas[j].bottom);

            // Requested size may be zero by rounding error with/without zooming.

            // The ae regions should be at least 1 if metering width/height is not zero.

            if (reqMeteringAreas[i + 0] == reqMeteringAreas[i + 2]) {

                reqMeteringAreas[i + 2]++;

            }

            if (reqMeteringAreas[i + 1] == reqMeteringAreas[i + 3]) {

                reqMeteringAreas[i + 3]++;

            }

        } else {

            reqMeteringAreas[i + 0] = 0;

            reqMeteringAreas[i + 1] = 0;