Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8

1 files changed, 13 insertions, 2 deletions

diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
index 9137fbc05..0b082b02b 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
@@ -295,16 +295,27 @@ void QAndroidCameraSession::applyViewfinderSettings(const QSize &captureSize, bo
             adjustedViewfinderResolution = vfRes;
         } else if (validCaptureSize) {
             // search for viewfinder resolution with the same aspect ratio
+            qreal minAspectDiff = 1;
+            QSize closestResolution;
             for (int i = previewSizes.count() - 1; i >= 0; --i) {
                 const QSize &size = previewSizes.at(i);
-                if (qAbs(captureAspectRatio - (qreal(size.width()) / size.height())) < 0.01) {
+                const qreal sizeAspect = qreal(size.width()) / size.height();
+                if (qFuzzyCompare(captureAspectRatio, sizeAspect)) {
                     adjustedViewfinderResolution = size;
                     break;
+                } else if (minAspectDiff > qAbs(sizeAspect - captureAspectRatio)) {
+                    closestResolution = size;
+                    minAspectDiff = qAbs(sizeAspect - captureAspectRatio);
                 }
             }
             if (!adjustedViewfinderResolution.isValid()) {
                 qWarning("Cannot find a viewfinder resolution matching the capture aspect ratio.");
-                return;
+                if (closestResolution.isValid()) {
+                    adjustedViewfinderResolution = closestResolution;
+                    qWarning("Using closest viewfinder resolution.");
+                } else {
+                    return;
+                }
             }
         } else {
             adjustedViewfinderResolution = previewSizes.last();