diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:35:52 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:35:52 +0200 |
commit | 48086a7573268774fab346d6fde0c9137ba1bf4e (patch) | |
tree | 8c976ef081c2b9a844fcc70deae7de55d09d23fd | |
parent | f2b9fb776b78fc10424c0325ab4316a45360130e (diff) | |
parent | 711efc552d65f22b262e049c5a046198377519dc (diff) | |
download | qtmultimedia-48086a7573268774fab346d6fde0c9137ba1bf4e.tar.gz |
Merge remote-tracking branch 'origin/5.6.1' into 5.7.0
Change-Id: If59885e0d0780390705c69fa7520c6ccc179ef45
-rw-r--r-- | dist/changes-5.6.1 | 64 | ||||
-rw-r--r-- | src/plugins/winrt/qwinrtcameracontrol.cpp | 15 |
2 files changed, 73 insertions, 6 deletions
diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 new file mode 100644 index 000000000..df0e3c1ad --- /dev/null +++ b/dist/changes-5.6.1 @@ -0,0 +1,64 @@ +Qt 5.6.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + https://doc.qt.io/qt-5.6 + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Android +------- + + - [QTBUG-51911] fixed camera frames appearing flipped for a brief moment + when starting or stopping a video recording. + +iOS / OS X +---------- + + - Fixed the camera resolution incorrectly being changed when switching + to image capture mode. + +Linux +----- + + - PulseAudio: fixed playback of short streams never starting with + QAudioOutput in pull mode. + - [QTBUG-40823][QTBUG-49461] changing the volume of a QAudioOutput or + QAudioInput doesn't affect the system volume anymore. + - [QTBUG-51607] fixed camera not working when QT_NO_GLIB is set. + +QNX +--- + + - Fixed video playback in VMWare. + +Windows +------- + + - The DirectShow backend is now available on Windows CE. + - [QTBUG-49281] fixed a memory leak when stopping the camera. + - [QTBUG-53114] QMediaPlayer can now load UNC paths. + +WinRT +----- + + - [QTBUG-38802] the manifest now automatically includes permissions for + microphone and camera when a project contains QT += multimedia. + - [QTBUG-47803] fixed camera image capture signals not being emitted when + the first capture is done. diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index a4584487a..856549438 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); |