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

Commit 1d4e72f3 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Allow maxDigitalZoom to be less than maxZoomRatio 

For concurrent camera, we allow the maximum digital zoom to be smaller
than the maximum zoom ratio. Adjust VTS test accordingly.

Test: camera VTS test
Bug: 151891611
Change-Id: I1d3813ed93faa83689dcb6a83490fae5581c602f
parent 6df119f6

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!";