commit 030ff1d67df6065d19cbc65c7a928ba35dc21221
author Clemenz Portmann <portmannc@google.com> Wed Apr 21 12:55:13 2021 -0700
committer Clemenz Portmann <portmannc@google.com> Wed Apr 21 21:37:14 2021 +0000
tree 01d231f37d6eb7495695b4ca7a94fd4099831a48
parent 3acc0a6d0001ff3c9e242084f6db3ab6972db7f6

ITS: handle scene5 test requirements for IR camera

bug: 186026515
Change-Id: Ieb186d832bc38233d77722733755a122ccc5636d

apps/CameraITS/tools/run_all_tests.py

diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index 700f205..2ed62db 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -23,6 +23,7 @@
 import yaml
 
 import capture_request_utils
+import camera_properties_utils
 import image_processing_utils
 import its_session_utils
 
@@ -230,13 +231,15 @@
       device_id=device_id,
       camera_id=camera_id) as cam:
     props = cam.get_camera_properties()
+    props = cam.override_with_hidden_physical_camera_props(props)
 
     while True:
       input(f'\n Press <ENTER> after positioning camera {camera_id} with '
             f'{scene}.\n The scene setup should be: \n  {_SCENE_REQ[scene]}\n')
       # Converge 3A prior to capture
       if scene == 'scene5':
-        cam.do_3a(do_af=False, lock_ae=True, lock_awb=True)
+        cam.do_3a(do_af=False, lock_ae=camera_properties_utils.ae_lock(props),
+                  lock_awb=camera_properties_utils.awb_lock(props))
       else:
         cam.do_3a()
       req, fmt = capture_request_utils.get_fastest_auto_capture_settings(props)