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

Commit 96c39e6f authored by Wei Lee's avatar Wei Lee
Browse files

Camera: Calculate FOVs for external camera if the information is provided 

Currently we set (-1.0, -1.0) as FOV for external cameras.
In this CL, it will try to calculate FOV if the required information is
provided in its metadata.

Bug: 160824680
Test: Run Rotation Vector Test in CTSV on electro.
Change-Id: Ifeb81e4ade9217b854dbf0359ff01df7dac89500
parent 651ebc45

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

+18 −3
Original line number Diff line number Diff line
@@ -3253,6 +3253,8 @@ Parameters::CropRegion Parameters::calculateCropRegion(bool previewOnly) const { 


status_t Parameters::calculatePictureFovs(float *horizFov, float *vertFov)

        const {

    // For external camera, use FOVs = (-1.0, -1.0) as default values. Calculate

    // FOVs only if there is sufficient information.

    if (fastInfo.isExternalCamera) {

        if (horizFov != NULL) {

            *horizFov = -1.0;
@@ -3260,16 +3262,29 @@ status_t Parameters::calculatePictureFovs(float *horizFov, float *vertFov) 
        if (vertFov != NULL) {

            *vertFov = -1.0;

        }

        return OK;

    }



    camera_metadata_ro_entry_t sensorSize =

            staticInfo(ANDROID_SENSOR_INFO_PHYSICAL_SIZE, 2, 2);

    if (!sensorSize.count) return NO_INIT;

    if (!sensorSize.count) {

        // It is non-fatal for external cameras since it has default values.

        if (fastInfo.isExternalCamera) {

            return OK;

        } else {

            return NO_INIT;

        }

    }



    camera_metadata_ro_entry_t pixelArraySize =

            staticInfo(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE, 2, 2);

    if (!pixelArraySize.count) return NO_INIT;

    if (!pixelArraySize.count) {

        // It is non-fatal for external cameras since it has default values.

        if (fastInfo.isExternalCamera) {

            return OK;

        } else {

            return NO_INIT;

        }

    }



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

            fastInfo.arrayHeight;