From 1d4e72f3873cb26c1be52ca6a1993a677e2bbca5 Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Wed, 27 May 2020 10:05:20 -0700 Subject: [PATCH] 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 --- .../vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index bf5fbfe692..550a2e0c92 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -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!";