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

Change-Id: I5f18b158df33c35c7e990eda2cd2005ea5811ee4
This commit is contained in:
TreeHugger Robot
2020-05-27 21:36:44 +00:00
committed by Automerger Merge Worker

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