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

Change-Id: Ib95ddbbc6e2b69663597cae045ec81eda6d12d58

1 files changed, 25 insertions, 10 deletions

diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
index 40946270a..a4584487a 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
@@ -101,15 +101,30 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device,
         ComPtr<IMediaEncodingProperties> properties;
         hr = (*propertiesList)->GetAt(index, &properties);
         Q_ASSERT_SUCCEEDED(hr);
-        ComPtr<IVideoEncodingProperties> videoProperties;
-        hr = properties.As(&videoProperties);
-        Q_ASSERT_SUCCEEDED(hr);
-        UINT32 width, height;
-        hr = videoProperties->get_Width(&width);
-        Q_ASSERT_SUCCEEDED(hr);
-        hr = videoProperties->get_Height(&height);
-        Q_ASSERT_SUCCEEDED(hr);
-        resolutions->append(QSize(width, height));
+        if (type == MediaStreamType_VideoRecord || type == MediaStreamType_VideoPreview) {
+            ComPtr<IVideoEncodingProperties> videoProperties;
+            hr = properties.As(&videoProperties);
+            Q_ASSERT_SUCCEEDED(hr);
+            UINT32 width, height;
+            hr = videoProperties->get_Width(&width);
+            Q_ASSERT_SUCCEEDED(hr);
+            hr = videoProperties->get_Height(&height);
+            Q_ASSERT_SUCCEEDED(hr);
+            resolutions->append(QSize(width, height));
+        } else if (type == MediaStreamType_Photo) {
+            ComPtr<IImageEncodingProperties> imageProperties;
+            hr = properties.As(&imageProperties);
+            // Asking for Photo also returns video resolutions in addition
+            // We skip those, as we are only interested in image Type
+            if (FAILED(hr) || !imageProperties)
+                continue;
+            UINT32 width, height;
+            hr = imageProperties->get_Width(&width);
+            Q_ASSERT_SUCCEEDED(hr);
+            hr = imageProperties->get_Height(&height);
+            Q_ASSERT_SUCCEEDED(hr);
+            resolutions->append(QSize(width, height));
+        }
     }
     return resolutions->isEmpty() ? MF_E_INVALID_FORMAT : hr;
 }
@@ -617,7 +632,7 @@ void QWinRTCameraControl::setState(QCamera::State state)
         }
 
         QCameraFocus::FocusModes focusMode = d->cameraFocusControl->focusMode();
-        if (setFocus(focusMode) && focusMode == QCameraFocus::ContinuousFocus)
+        if (focusMode != 0 && setFocus(focusMode) && focusMode == QCameraFocus::ContinuousFocus)
             focus();
 
         d->state = QCamera::ActiveState;