Merge "CameraITS: Skip param_tonemap_mode if contrast_curve mode is not supported" into pie-cts-dev am: f974eed18d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1490248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib59adb46e1220c213ab95fbe14373906da963bf0
diff --git a/apps/CameraITS/pymodules/its/caps.py b/apps/CameraITS/pymodules/its/caps.py
index d75532b..87b88e9 100644
--- a/apps/CameraITS/pymodules/its/caps.py
+++ b/apps/CameraITS/pymodules/its/caps.py
@@ -395,6 +395,19 @@
"android.edge.availableEdgeModes") and mode \
in props["android.edge.availableEdgeModes"];
+def tonemap_mode(props, mode):
+ """Returns whether a device supports the tonemap mode.
+
+ Args:
+ props: Camera properties object.
+ mode: Integer, indicating the tonemap mode to check for availability.
+
+ Return:
+ Boolean.
+ """
+ return props.has_key(
+ "android.tonemap.availableToneMapModes") and mode \
+ in props["android.tonemap.availableToneMapModes"];
def lens_calibrated(props):
"""Returns whether lens position is calibrated or not.
diff --git a/apps/CameraITS/tests/scene1/test_param_tonemap_mode.py b/apps/CameraITS/tests/scene1/test_param_tonemap_mode.py
index 45a5b13..261eed1 100644
--- a/apps/CameraITS/tests/scene1/test_param_tonemap_mode.py
+++ b/apps/CameraITS/tests/scene1/test_param_tonemap_mode.py
@@ -39,7 +39,8 @@
with its.device.ItsSession() as cam:
props = cam.get_camera_properties()
its.caps.skip_unless(its.caps.compute_target_exposure(props) and
- its.caps.per_frame_control(props))
+ its.caps.per_frame_control(props) and
+ its.caps.tonemap_mode(props, 0))
debug = its.caps.debug_mode()
largest_yuv = its.objects.get_largest_yuv_format(props)