CameraITS: update LSC test per HAL3.3 change
Bug: 21403373
Change-Id: I86a3fa47767af0e15aee7b71feabcb8e612ce9a1
diff --git a/apps/CameraITS/pymodules/its/caps.py b/apps/CameraITS/pymodules/its/caps.py
index e57ff88..70bb2ca 100644
--- a/apps/CameraITS/pymodules/its/caps.py
+++ b/apps/CameraITS/pymodules/its/caps.py
@@ -257,6 +257,32 @@
return props.has_key("android.control.awbLockAvailable") and \
props["android.control.awbLockAvailable"] == 1
+def lsc_map(props):
+ """Returns whether a device supports lens shading map output
+
+ Args:
+ props: Camera properties object.
+
+ Return:
+ Boolean.
+ """
+ return props.has_key(
+ "android.statistics.info.availableLensShadingMapModes") and \
+ 1 in props["android.statistics.info.availableLensShadingMapModes"]
+
+def lsc_off(props):
+ """Returns whether a device supports disabling lens shading correction
+
+ Args:
+ props: Camera properties object.
+
+ Return:
+ Boolean.
+ """
+ return props.has_key(
+ "android.shading.availableModes") and \
+ 0 in props["android.shading.availableModes"]
+
class __UnitTest(unittest.TestCase):
"""Run a suite of unit tests on this module.
"""
diff --git a/apps/CameraITS/tests/scene1/test_param_shading_mode.py b/apps/CameraITS/tests/scene1/test_param_shading_mode.py
index 65b7e97..8538675 100644
--- a/apps/CameraITS/tests/scene1/test_param_shading_mode.py
+++ b/apps/CameraITS/tests/scene1/test_param_shading_mode.py
@@ -35,11 +35,17 @@
with its.device.ItsSession() as cam:
props = cam.get_camera_properties()
- its.caps.skip_unless(its.caps.per_frame_control(props))
+ its.caps.skip_unless(its.caps.per_frame_control(props) and
+ its.caps.lsc_map(props) and
+ its.caps.lsc_off(props))
assert(props.has_key("android.lens.info.shadingMapSize") and
props["android.lens.info.shadingMapSize"] != None)
+ # lsc_off devices should always support OFF(0), FAST(1), and HQ(2)
+ assert(props.has_key("android.shading.availableModes") and
+ set(props["android.shading.availableModes"]) == set([0, 1, 2]))
+
num_map_gains = props["android.lens.info.shadingMapSize"]["width"] * \
props["android.lens.info.shadingMapSize"]["height"] * 4