CameraITS: skip AF in scene5
We used to expect AF can focus in all test scenes, but
this is not true anymore with the new scene5 where
camera should see a full flat scene.
Bug: 28424764
Change-Id: Id30996ac8cf976b7969b5d2ab218c29c9ba8c57d
diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index 3ed908e..7239c9a 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -62,6 +62,9 @@
"scene5" : "Capture images with a diffuser attached to the camera. See "
"CameraITS.pdf section 2.3.4 for more details"
}
+ scene_extra_args = {
+ "scene5" : ["doAF=False"]
+ }
tests = []
for d in scenes:
tests += [(d,s[:-3],os.path.join("tests", d, s))
@@ -120,9 +123,11 @@
out_path = os.path.join(topdir, camera_id, scene+".jpg")
out_arg = "out=" + out_path
scene_arg = "scene=" + scene_req[scene]
+ extra_args = scene_extra_args.get(scene, [])
cmd = ['python',
os.path.join(os.getcwd(),"tools/validate_scene.py"),
- camera_id_arg, out_arg, scene_arg, device_id_arg]
+ camera_id_arg, out_arg, scene_arg, device_id_arg] + \
+ extra_args
retcode = subprocess.call(cmd,cwd=topdir)
assert(retcode == 0)
print "Start running tests for", scene
diff --git a/apps/CameraITS/tools/validate_scene.py b/apps/CameraITS/tools/validate_scene.py
index 1f35163..cfe14e2 100644
--- a/apps/CameraITS/tools/validate_scene.py
+++ b/apps/CameraITS/tools/validate_scene.py
@@ -26,6 +26,7 @@
out_path = ""
scene_name = ""
scene_desc = "No requirement"
+ do_af = True
for s in sys.argv[1:]:
if s[:7] == "camera=" and len(s) > 7:
camera_id = s[7:]
@@ -33,6 +34,8 @@
out_path = s[4:]
elif s[:6] == "scene=" and len(s) > 6:
scene_desc = s[6:]
+ elif s[:5] == "doAF=" and len(s) > 5:
+ do_af = s[5:] == "True"
if out_path != "":
scene_name = re.split("/|\.", out_path)[-2]
@@ -46,7 +49,7 @@
" to frame the test scene: " + scene_name +
"\nThe scene setup should be: " + scene_desc )
# Converge 3A prior to capture.
- cam.do_3a(do_af=True, lock_ae=True, lock_awb=True)
+ cam.do_3a(do_af=do_af, lock_ae=True, lock_awb=True)
props = cam.get_camera_properties()
req = its.objects.fastest_auto_capture_request(props)
if its.caps.ae_lock(props):