commit b76a4d93e407bb35b171bee7a70eb5e89313d78b
author Emilian Peev <epeev@google.com> Fri Jun 29 08:03:00 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 29 08:03:00 2018 -0700
tree 2030e4e1722ecab3759fbb2c65044a464d980be8
parent f1aa9d6b8844abec14401e6ca9405a962987b877
parent 8216f3df076b3db4c6b5e0de3b2acb1b4cebeadb

Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pi-dev
am: 8216f3df07

Change-Id: I22c33c7ec08d0ab7b6d9c664f6a18a41558fb4f6

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 95c7167..f8022ae 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -3643,6 +3643,7 @@
                                         static_cast<int32_t>(PixelFormat::IMPLEMENTATION_DEFINED)};
     uint64_t bufferId = 1;
     uint32_t frameNumber = 1;
+    float isoTol = .03f;
     ::android::hardware::hidl_vec<uint8_t> settings;
 
     for (const auto& name : cameraDeviceNames) {
@@ -3772,7 +3773,8 @@
             ASSERT_TRUE(inflightReqs[i].collectedResult.exists(ANDROID_SENSOR_SENSITIVITY));
             camera_metadata_entry_t isoResult = inflightReqs[i].collectedResult.find(
                     ANDROID_SENSOR_SENSITIVITY);
-            ASSERT_TRUE(isoResult.data.i32[0] == isoValues[i]);
+            ASSERT_TRUE(std::abs(isoResult.data.i32[0] - isoValues[i]) <=
+                        std::round(isoValues[i]*isoTol));
         }
 
         ret = session->close();