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

Camera: Allow maxDigitalZoom to be less than maxZoomRatio

Browse Source 
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
This commit is contained in:
Shuzhen Wang
2020-05-27 10:05:20 -07:00
parent 6df119f6a9
commit 1d4e72f387
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!";