diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:36 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:37 +0200 |
commit | e1992d9d1db9e16161a4135d1a525482980c747d (patch) | |
tree | fabd86f120270d0027159907bc81d824915c9a21 /src | |
parent | bff19dbe6733d245adc2daf79fe3bab017abb1e2 (diff) | |
parent | 711efc552d65f22b262e049c5a046198377519dc (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: I0b4fde2a47b428fd04012a8dbec16fd14797b8dd
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/winrt/qwinrtcameracontrol.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index cc80c0e7d..f11a975b2 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -101,7 +101,13 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device, ComPtr<IMediaEncodingProperties> properties; hr = (*propertiesList)->GetAt(index, &properties); Q_ASSERT_SUCCEEDED(hr); - if (type == MediaStreamType_VideoRecord || type == MediaStreamType_VideoPreview) { + HString propertyType; + hr = properties->get_Type(propertyType.GetAddressOf()); + Q_ASSERT_SUCCEEDED(hr); + + const HStringReference videoRef = HString::MakeReference(L"Video"); + const HStringReference imageRef = HString::MakeReference(L"Image"); + if (propertyType == videoRef) { ComPtr<IVideoEncodingProperties> videoProperties; hr = properties.As(&videoProperties); Q_ASSERT_SUCCEEDED(hr); @@ -111,13 +117,10 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device, hr = videoProperties->get_Height(&height); Q_ASSERT_SUCCEEDED(hr); resolutions->append(QSize(width, height)); - } else if (type == MediaStreamType_Photo) { + } else if (propertyType == imageRef) { 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; + Q_ASSERT_SUCCEEDED(hr); UINT32 width, height; hr = imageProperties->get_Width(&width); Q_ASSERT_SUCCEEDED(hr); |