commit b14a4860e4b47056e86e626553d6b503db90f791
author huans <huans@google.com> Fri Jan 26 17:15:24 2018 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Thu Jan 24 18:12:57 2019 +0000
tree 708e0e37a92e120fbc56841b21c9d94aabbfd72b
parent 8b4721b9de0d8b8f6cc920a0cc699f372d2fe0eb

do ae/awb based on Camera capability

Bug: 72444281
Test: python tools/run_all_tests.py
Change-Id: I9ea942676e746841dca6feb4efe692e8a9abf691
Merged-In: I9ea942676e746841dca6feb4efe692e8a9abf691
(cherry picked from commit be34519f64ef0195dd039e5bc53d7332b6ce8535)

apps/CameraITS/tools/validate_scene.py

diff --git a/apps/CameraITS/tools/validate_scene.py b/apps/CameraITS/tools/validate_scene.py
index cfe14e2..1c0f0fd 100644
--- a/apps/CameraITS/tools/validate_scene.py
+++ b/apps/CameraITS/tools/validate_scene.py
@@ -49,8 +49,9 @@
                 " to frame the test scene: " + scene_name +
                 "\nThe scene setup should be: " + scene_desc )
         # Converge 3A prior to capture.
-        cam.do_3a(do_af=do_af, lock_ae=True, lock_awb=True)
         props = cam.get_camera_properties()
+        cam.do_3a(do_af=do_af, lock_ae=its.caps.ae_lock(props),
+                  lock_awb=its.caps.awb_lock(props))
         req = its.objects.fastest_auto_capture_request(props)
         if its.caps.ae_lock(props):
             req["android.control.awbLock"] = True