commit 4a1375152743944860eb72ec2117bfb73b664387
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Aug 10 00:02:12 2016 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Fri Aug 19 14:36:30 2016 -0700
tree 336a4df4ba7bb31bb3d50c9a520e4d33b1c449c9
parent 3750f52ea0cff8372228df113748b7deeb95a360

CameraITS: fix largest size logic

Bug: 30705041
Change-Id: Ibc20aa802806458bd2e9f88226655e81d4022854

apps/CameraITS/pymodules/its/objects.py

diff --git a/apps/CameraITS/pymodules/its/objects.py b/apps/CameraITS/pymodules/its/objects.py
index 58fe4ec..9766ab9 100644
--- a/apps/CameraITS/pymodules/its/objects.py
+++ b/apps/CameraITS/pymodules/its/objects.py
@@ -185,7 +185,8 @@
         ar = match_ar_size[0] / float(match_ar_size[1])
         out_sizes = [s for s in out_sizes if
                 abs(ar - s[0] / float(s[1])) <= AR_TOLERANCE]
-    out_sizes.sort(reverse=True)
+    out_sizes.sort(reverse=True, key=lambda s: s[0]) # 1st pass, sort by width
+    out_sizes.sort(reverse=True, key=lambda s: s[0]*s[1]) # sort by area
     return out_sizes
 
 def set_filter_off_or_fast_if_possible(props, req, available_modes, filter):