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

Commit 5b3570dc authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Don't advertize zoom in case max digital zoom is 1 

Mark immediate zoom as not supported in case the camera has
maximum digial zoom close to 1. This will avoid corner
cases wehere we can have 'NUM_ZOOM_STEPS' all equal to 1.

Bug: 33093106
Test: Complete CameraTest CTS package
runtest -x cts/tests/camera/src/android/hardware/cts/

Change-Id: I039276385de74192375f36b1504dd89cb8ae0c52
parent ac3e2cce

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

+33 −24
Original line number Diff line number Diff line
@@ -816,13 +816,15 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { 
            "(0,0,0,0,0)");



    zoom = 0;

    params.set(CameraParameters::KEY_ZOOM, zoom);

    params.set(CameraParameters::KEY_MAX_ZOOM, NUM_ZOOM_STEPS - 1);



    zoomAvailable = false;

    camera_metadata_ro_entry_t maxDigitalZoom =

        staticInfo(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, /*minCount*/1, /*maxCount*/1);

    if (!maxDigitalZoom.count) return NO_INIT;



    if (fabs(maxDigitalZoom.data.f[0] - 1.f) > 0.00001f) {

        params.set(CameraParameters::KEY_ZOOM, zoom);

        params.set(CameraParameters::KEY_MAX_ZOOM, NUM_ZOOM_STEPS - 1);



        {

            String8 zoomRatios;

            float zoom = 1.f;
@@ -840,6 +842,11 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { 


        params.set(CameraParameters::KEY_ZOOM_SUPPORTED,

                CameraParameters::TRUE);

        zoomAvailable = true;

    } else {

        params.set(CameraParameters::KEY_ZOOM_SUPPORTED,

                CameraParameters::FALSE);

    }

    params.set(CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED,

            CameraParameters::FALSE);
@@ -1856,6 +1863,7 @@ status_t Parameters::set(const String8& paramString) { 
    }



    // ZOOM

    if (zoomAvailable) {

        validatedParams.zoom = newParams.getInt(CameraParameters::KEY_ZOOM);

        if (validatedParams.zoom < 0

                    || validatedParams.zoom >= (int)NUM_ZOOM_STEPS) {
@@ -1863,6 +1871,7 @@ status_t Parameters::set(const String8& paramString) { 
                    __FUNCTION__, validatedParams.zoom);

            return BAD_VALUE;

        }

    }



    // VIDEO_SIZE

    newParams.getVideoSize(&validatedParams.videoWidth,

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

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct Parameters { 
    Vector<Area> meteringAreas;



    int zoom;

    bool zoomAvailable;



    int videoWidth, videoHeight, videoFormat;

    android_dataspace videoDataSpace;