Added worst-case fix

fkeglevich · Jan 19, 2019 · 895962b · 895962b
1 parent b1940c9
commit 895962b
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/...ava/com/fkeglevich/rawdumper/camera/feature/restriction/chain/fixer/PreviewSizeFixer.java b/...ava/com/fkeglevich/rawdumper/camera/feature/restriction/chain/fixer/PreviewSizeFixer.java
@@ -44,7 +44,31 @@ public CaptureSize fixValue(ValueValidator<CaptureSize, List<CaptureSize>> newVa
             if (preview.hasSameAspectRatio(pictureSize))
                 previewCandidates.add(preview);
 
+        if (previewCandidates.isEmpty())
+            return getAtLeastOnePreviewSize(pictureSize, newValidator.getAvailableValues());
+
         Collections.sort(previewCandidates);
         return previewCandidates.get(previewCandidates.size() - 1);
     }
+
+    private CaptureSize getAtLeastOnePreviewSize(CaptureSize pictureSize, List<CaptureSize> available)
+    {
+        double ratio = ((double) pictureSize.getAspectRatioX()) /  ((double) pictureSize.getAspectRatioY());
+        double minDiff = Double.POSITIVE_INFINITY;
+        CaptureSize result = available.get(0);
+
+        for (CaptureSize preview : available)
+        {
+            double previewRatio = ((double) preview.getAspectRatioX()) /  ((double) preview.getAspectRatioY());
+            double diff = Math.abs(ratio - previewRatio);
+
+            if (diff < minDiff)
+            {
+                minDiff = diff;
+                result = preview;
+            }
+        }
+
+        return result;
+    }
 }