Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: I5a5b387b93a4b9dbaa9710e78fd7bf1ca09aa3b3

src/plugins/avfoundation/camera/avfcameraflashcontrol.mm

@@ -157,7 +157,7 @@ void AVFCameraFlashControl::cameraStateChanged(QCamera::State newState)
 
 bool AVFCameraFlashControl::applyFlashSettings()
 {
-    Q_ASSERT(m_session->state() == QCamera::ActiveState);
+    Q_ASSERT(m_session->requestedState() == QCamera::ActiveState);
 
     AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
     if (!captureDevice) {

src/plugins/directshow/camera/dscamerasession.cpp

@@ -789,7 +789,7 @@ void DSCameraSession::disconnectGraph()
 
 static bool qt_frameRateRangeGreaterThan(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2)
 {
-    return r1.second > r2.second;
+    return r1.maximumFrameRate > r2.maximumFrameRate;
 }
 
 void DSCameraSession::updateSourceCapabilities()
@@ -896,8 +896,8 @@ void DSCameraSession::updateSourceCapabilities()
                 Q_FOREACH (const QCamera::FrameRateRange &frameRateRange, frameRateRanges) {
                     QCameraViewfinderSettings settings;
                     settings.setResolution(resolution);
-                    settings.setMinimumFrameRate(frameRateRange.first);
-                    settings.setMaximumFrameRate(frameRateRange.second);
+                    settings.setMinimumFrameRate(frameRateRange.minimumFrameRate);
+                    settings.setMaximumFrameRate(frameRateRange.maximumFrameRate);
                     settings.setPixelFormat(pixelFormat);
                     m_supportedViewfinderSettings.append(settings);
 

src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp

@@ -56,7 +56,7 @@
 
 using namespace Microsoft::WRL;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define BREAK_IF_FAILED(msg) RETURN_IF_FAILED(msg, break)
 #define CONTINUE_IF_FAILED(msg) RETURN_IF_FAILED(msg, continue)
@@ -408,3 +408,5 @@ void QWinRTAbstractVideoRendererControl::present()
     QVideoFrame frame(d->videoBuffer, d->format.frameSize(), d->format.pixelFormat());
     d->surface->present(frame);
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtcameracontrol.cpp

@@ -68,7 +68,7 @@ using namespace ABI::Windows::Media::Devices;
 using namespace ABI::Windows::Media::MediaProperties;
 using namespace ABI::Windows::Storage::Streams;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define RETURN_VOID_AND_EMIT_ERROR(msg) \
     if (FAILED(hr)) { \
@@ -134,6 +134,7 @@ public:
         hr = deviceInfo->get_SystemSku(deviceModel.GetAddressOf());
         Q_ASSERT_SUCCEEDED(hr);
         m_flags |= bufferLockRequired(L"NOKIA RM-976", deviceModel);
+        m_flags |= bufferLockRequired(L"NOKIA RM-1019", deviceModel);
 #endif
     }
 
@@ -852,3 +853,5 @@ HRESULT QWinRTCameraControl::onRecordLimitationExceeded(IMediaCapture *)
     setState(QCamera::LoadedState);
     return S_OK;
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp

@@ -65,7 +65,7 @@ using namespace ABI::Windows::Media::MediaProperties;
 using namespace ABI::Windows::Storage::Streams;
 using namespace ABI::Windows::Graphics::Imaging;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define wchar(str) reinterpret_cast<const wchar_t *>(str.utf16())
 
@@ -299,3 +299,5 @@ HRESULT QWinRTCameraImageCaptureControl::onCaptureCompleted(IAsyncAction *asyncI
 
     return S_OK;
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtcamerainfocontrol.cpp

@@ -37,7 +37,7 @@
 #include "qwinrtcamerainfocontrol.h"
 #include "qwinrtvideodeviceselectorcontrol.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QWinRTCameraInfoControl::QWinRTCameraInfoControl(QObject *parent)
     : QCameraInfoControl(parent)
@@ -53,3 +53,5 @@ int QWinRTCameraInfoControl::cameraOrientation(const QString &deviceName) const
 {
     return QWinRTVideoDeviceSelectorControl::cameraOrientation(deviceName);
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtcameraservice.cpp

@@ -46,7 +46,7 @@
 #include <QtMultimedia/QVideoDeviceSelectorControl>
 #include <QtMultimedia/QImageEncoderControl>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QWinRTCameraServicePrivate
 {
@@ -103,3 +103,5 @@ void QWinRTCameraService::releaseControl(QMediaControl *control)
 {
     Q_UNUSED(control);
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp

@@ -45,7 +45,7 @@
 #include <wrl.h>
 using namespace Microsoft::WRL;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class D3DVideoBlitter
 {
@@ -210,3 +210,5 @@ void QWinRTCameraVideoRendererControl::discardBuffers()
     for (ComPtr<IMF2DBuffer> &buffer : d->buffers)
         buffer.Reset();
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtmediaplayercontrol.cpp

@@ -55,7 +55,7 @@
 #include <wrl.h>
 using namespace Microsoft::WRL;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define QT_WINRT_MEDIAPLAYER_STREAM_ID "__qtmultimedia_winrt_player_stream"
 
@@ -892,3 +892,5 @@ void QWinRTMediaPlayerControl::finishRead()
     Q_D(QWinRTMediaPlayerControl);
     d->streamProvider->finishRead();
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtmediaplayercontrol.h

@@ -41,7 +41,7 @@
 
 struct IMFMediaEngineClassFactory;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QVideoRendererControl;
 
@@ -96,4 +96,6 @@ private:
     Q_DECLARE_PRIVATE(QWinRTMediaPlayerControl)
 };
 
+QT_END_NAMESPACE
+
 #endif // QWINRTMEDIAPLAYERCONTROL_H

src/plugins/winrt/qwinrtmediaplayerservice.cpp

@@ -47,7 +47,7 @@
 
 using namespace Microsoft::WRL;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QWinRTMediaPlayerServicePrivate
 {
@@ -104,3 +104,5 @@ void QWinRTMediaPlayerService::releaseControl(QMediaControl *control)
     if (control == d->player)
         d->player->deleteLater();
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtplayerrenderercontrol.cpp

@@ -54,7 +54,7 @@
 #include <wrl.h>
 using namespace Microsoft::WRL;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 template <typename T>
 class D3DDeviceLocker
@@ -149,3 +149,5 @@ bool QWinRTPlayerRendererControl::render(ID3D11Texture2D *texture)
     RETURN_FALSE_IF_FAILED("Failed to transfer video frame to DXGI surface");
     return true;
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtserviceplugin.cpp

@@ -42,7 +42,7 @@
 #include "qwinrtcameraservice.h"
 #include "qwinrtvideodeviceselectorcontrol.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QMediaService *QWinRTServicePlugin::create(QString const &key)
 {
@@ -102,3 +102,5 @@ QByteArray QWinRTServicePlugin::defaultDevice(const QByteArray &service) const
 
     return QByteArray();
 }
+
+QT_END_NAMESPACE

src/plugins/winrt/qwinrtserviceplugin.h

@@ -39,7 +39,7 @@
 
 #include <QtMultimedia/QMediaServiceProviderPlugin>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QWinRTServicePlugin : public QMediaServiceProviderPlugin
         , public QMediaServiceFeaturesInterface
@@ -68,4 +68,6 @@ public:
     QByteArray defaultDevice(const QByteArray &service) const Q_DECL_OVERRIDE;
 };
 
+QT_END_NAMESPACE
+
 #endif // QWINRTSERVICEPLUGIN_H

src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp

@@ -55,7 +55,7 @@ typedef ITypedEventHandler<DeviceWatcher *, DeviceInformation *> DeviceInformati
 typedef ITypedEventHandler<DeviceWatcher *, DeviceInformationUpdate *> DeviceInformationUpdateHandler;
 typedef ITypedEventHandler<DeviceWatcher *, IInspectable *> DeviceEnumerationCompletedHandler;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 static QString deviceName(IDeviceInformation *device)
 {
@@ -386,3 +386,5 @@ void QWinRTVideoDeviceSelectorControl::setSelectedDevice(int index)
         emit selectedDeviceChanged(deviceName(d->selectedDevice));
     }
 }
+
+QT_END_NAMESPACE