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

Commit ea210e25 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by android-build-merger
Browse files

Merge "CameraService: API1: fix picture FOV" into lmp-mr1-dev 

automerge: 3736dbc5

* commit '3736dbc5':
  CameraService: API1: fix picture FOV
parents 8d55aa31 3736dbc5

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

+14 −0
Original line number Diff line number Diff line
@@ -2954,6 +2954,10 @@ status_t Parameters::calculatePictureFovs(float *horizFov, float *vertFov) 
            staticInfo(ANDROID_SENSOR_INFO_PHYSICAL_SIZE, 2, 2);

    if (!sensorSize.count) return NO_INIT;



    camera_metadata_ro_entry_t pixelArraySize =

            staticInfo(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE, 2, 2);

    if (!pixelArraySize.count) return NO_INIT;



    float arrayAspect = static_cast<float>(fastInfo.arrayWidth) /

            fastInfo.arrayHeight;

    float stillAspect = static_cast<float>(pictureWidth) / pictureHeight;
@@ -3003,6 +3007,16 @@ status_t Parameters::calculatePictureFovs(float *horizFov, float *vertFov) 
        vertCropFactor = (arrayAspect < stillAspect) ?

                (arrayAspect / stillAspect) : 1.f;

    }



    /**

     * Convert the crop factors w.r.t the active array size to the crop factors

     * w.r.t the pixel array size.

     */

    horizCropFactor *= (static_cast<float>(fastInfo.arrayWidth) /

                            pixelArraySize.data.i32[0]);

    vertCropFactor *= (static_cast<float>(fastInfo.arrayHeight) /

                            pixelArraySize.data.i32[1]);



    ALOGV("Horiz crop factor: %f, vert crop fact: %f",

            horizCropFactor, vertCropFactor);

    /**