Merge "CameraITS: relax several test threshold" into lmp-mr1-dev
diff --git a/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py b/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py
index 563cebd..bb91c9a 100644
--- a/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py
+++ b/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py
@@ -17,8 +17,10 @@
import its.objects
import its.target
+AE_FRAMES_PER_ITERATION = 8
+AE_CONVERGE_ITERATIONS = 3
# AE must converge within this number of auto requests under scene1
-THRESH_AE_CONVERGE = 8
+THRESH_AE_CONVERGE = AE_FRAMES_PER_ITERATION * AE_CONVERGE_ITERATIONS
def main():
"""Test the AE state machine when using the precapture trigger.
@@ -71,9 +73,12 @@
# Capture some more auto requests, and AE should converge.
auto_req['android.control.aePrecaptureTrigger'] = 0
- caps = cam.do_capture([auto_req] * THRESH_AE_CONVERGE, fmt)
- state = caps[-1]['metadata']['android.control.aeState']
- print "AE state after auto request:", state
+ for i in range(AE_CONVERGE_ITERATIONS):
+ caps = cam.do_capture([auto_req] * AE_FRAMES_PER_ITERATION, fmt)
+ state = caps[-1]['metadata']['android.control.aeState']
+ print "AE state after auto request:", state
+ if state == CONVERGED:
+ return
assert(state == CONVERGED)
if __name__ == '__main__':
diff --git a/apps/CameraITS/tests/scene1/test_linearity.py b/apps/CameraITS/tests/scene1/test_linearity.py
index a9063a9..2176f5e 100644
--- a/apps/CameraITS/tests/scene1/test_linearity.py
+++ b/apps/CameraITS/tests/scene1/test_linearity.py
@@ -33,7 +33,7 @@
"""
NAME = os.path.basename(__file__).split(".")[0]
- RESIDUAL_THRESHOLD = 0.00005
+ RESIDUAL_THRESHOLD = 0.0003 # approximately each sample is off by 2/255
# The HAL3.2 spec requires that curves up to 64 control points in length
# must be supported.
diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index f5a53b1..f8a7689 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -36,11 +36,9 @@
],
"scene1":[
"test_ae_precapture_trigger",
- "test_black_white",
"test_crop_region_raw",
"test_ev_compensation_advanced",
"test_ev_compensation_basic",
- "test_locked_burst",
"test_yuv_plus_jpeg"
]
}