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

Commit 07f07c67 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev... 

Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev am: 25ff02b7 am: a9607045 am: 1d234a4f

Change-Id: I767a8f245f982d5be325e296f9388c51607d37df
parents ebabb248 1d234a4f

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+5 −2
Original line number Diff line number Diff line
@@ -6942,8 +6942,11 @@ void CameraHidlTest::verifyZoomCharacteristics(const camera_metadata_t* metadata 


    float minZoomRatio = entry.data.f[0];

    float maxZoomRatio = entry.data.f[1];

    if (maxDigitalZoom != maxZoomRatio) {

        ADD_FAILURE() << "Maximum zoom ratio is different than maximum digital zoom!";

    constexpr float FLOATING_POINT_THRESHOLD = 0.00001f;

    if (maxDigitalZoom > maxZoomRatio + FLOATING_POINT_THRESHOLD) {

        ADD_FAILURE() << "Maximum digital zoom " << maxDigitalZoom

                      << " is larger than maximum zoom ratio " << maxZoomRatio << " + threshold "

                      << FLOATING_POINT_THRESHOLD << "!";

    }

    if (minZoomRatio > maxZoomRatio) {

        ADD_FAILURE() << "Maximum zoom ratio is less than minimum zoom ratio!";