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

am: 8216f3df07

Change-Id: I22c33c7ec08d0ab7b6d9c664f6a18a41558fb4f6
This commit is contained in:
Emilian Peev 2018-06-29 08:03:00 -07:00 committed by android-build-merger
commit b76a4d93e4

View file

@ -3643,6 +3643,7 @@ TEST_F(CameraHidlTest, processCaptureRequestBurstISO) {
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 @@ TEST_F(CameraHidlTest, processCaptureRequestBurstISO) {
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();