Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 10:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev am: 25ff02b703 am: 60747b7823 am: 6ec7a4846d

Browse Source 
Change-Id: Ie7a5b01c3b48bd57d09eb7df05669fa2fe3fd277
This commit is contained in:
TreeHugger Robot
2020-05-27 22:04:27 +00:00
committed by Automerger Merge Worker
parent ebabb24898 6ec7a4846d
commit 75bef4391f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View File

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