commit 7e4f847fec7edd2f94302db716b38d24fc2dd3ba
author Clemenz Portmann <portmannc@google.com> Fri Mar 17 09:42:16 2017 -0700
committer Clemenz Portmann <portmannc@google.com> Mon Mar 20 12:47:27 2017 -0700
tree 1f02d7971eef76059db5a1600eb384228f501b63
parent f5aa04b3d4089b656e9f3d6f32b5aa79304a34af

CameraITS: ensure min yuv format is landscape for tests

Change-Id: I73c9bfa0087e574a299dc2337a190536fb622f38

apps/CameraITS/tests/scene1/test_linearity.py

diff --git a/apps/CameraITS/tests/scene1/test_linearity.py b/apps/CameraITS/tests/scene1/test_linearity.py
index 9e9f1cc..9de1af3 100644
--- a/apps/CameraITS/tests/scene1/test_linearity.py
+++ b/apps/CameraITS/tests/scene1/test_linearity.py
@@ -51,10 +51,12 @@
                              its.caps.per_frame_control(props))
 
         debug = its.caps.debug_mode()
+        largest_yuv = its.objects.get_largest_yuv_format(props)
         if debug:
-            fmt = its.objects.get_largest_yuv_format(props)
+            fmt = largest_yuv
         else:
-            fmt = its.objects.get_smallest_yuv_format(props)
+            match_ar = (largest_yuv['width'], largest_yuv['height'])
+            fmt = its.objects.get_smallest_yuv_format(props, match_ar=match_ar)
 
         e,s = its.target.get_target_exposure_combos(cam)["midSensitivity"]
         s /= 2