Fix build on Windows after QMediaDevices rename

A bit too greedy, matched some Direct3D types.

As a drive-by, add missing includes and remove the incorrect export from
QMockVideoSink.

Change-Id: I9e2fa4a45a2682a1f259d5a11729a76f5172b72a
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

7 files changed, 10 insertions, 9 deletions

diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo.cpp b/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo.cpp
index 504e4ba25..fc00452cd 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo.cpp
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo.cpp
@@ -107,7 +107,8 @@ QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, int waveID, con
         supportedSampleFormats.append(QAudioFormat::Int16);
     }
 
-    supportedSampleRates = { INT_MAX, 0 };
+    minimumSampleRate = INT_MAX;
+    maximumSampleRate = 0;
     // Check sample rate
     if ((fmt & WAVE_FORMAT_1M08)
        || (fmt & WAVE_FORMAT_1S08)
diff --git a/src/multimedia/platform/windows/common/qwindowsmultimediautils.cpp b/src/multimedia/platform/windows/common/qwindowsmultimediautils.cpp
index a3e2783fa..cdf72c803 100644
--- a/src/multimedia/platform/windows/common/qwindowsmultimediautils.cpp
+++ b/src/multimedia/platform/windows/common/qwindowsmultimediautils.cpp
@@ -37,9 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qwindowsmultimediautils_p.h"
-
 #include <mfapi.h>
+#include "qwindowsmultimediautils_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h b/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h
index be52545a7..97e8da031 100644
--- a/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h
+++ b/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <private/qtmultimediaglobal_p.h>
-#include <qvideoframe.h>
+#include <qvideoframeformat.h>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp
index 767c4d673..ff0185b2e 100644
--- a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp
+++ b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp
@@ -164,7 +164,7 @@ HRESULT D3DPresentEngine::initializeD3D()
     HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &m_D3D9);
 
     if (SUCCEEDED(hr))
-        hr = DXVA2CreateDirect3DMediaDevices9(&m_deviceResetToken, &m_devices);
+        hr = DXVA2CreateDirect3DDeviceManager9(&m_deviceResetToken, &m_devices);
 
     return hr;
 }
@@ -253,7 +253,7 @@ HRESULT D3DPresentEngine::getService(REFGUID, REFIID riid, void** ppv)
 {
     HRESULT hr = S_OK;
 
-    if (riid == __uuidof(IDirect3DMediaDevices9)) {
+    if (riid == __uuidof(IDirect3DDeviceManager9)) {
         if (m_devices == NULL) {
             hr = MF_E_UNSUPPORTED_SERVICE;
         } else {
diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h b/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h
index f187b977c..54a4adf53 100644
--- a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h
+++ b/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h
@@ -58,7 +58,7 @@
 
 struct IDirect3D9Ex;
 struct IDirect3DDevice9Ex;
-struct IDirect3DMediaDevices9;
+struct IDirect3DDeviceManager9;
 struct IDirect3DSurface9;
 struct IDirect3DTexture9;
 struct IMFSample;
@@ -141,7 +141,7 @@ private:
 
     IDirect3D9Ex *m_D3D9;
     IDirect3DDevice9Ex *m_device;
-    IDirect3DMediaDevices9 *m_devices;
+    IDirect3DDeviceManager9 *m_devices;
 
     QVideoFrameFormat m_surfaceFormat;
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
index 159c29afa..1de07d605 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
@@ -41,6 +41,7 @@
 
 #include "qwindowscamerasession_p.h"
 #include "qwindowsmediacapture_p.h"
+#include <QtCore/QUrl>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/unit/mockbackend/qmockvideosink.h b/tests/auto/unit/mockbackend/qmockvideosink.h
index d83a7d022..66ac1bd2f 100644
--- a/tests/auto/unit/mockbackend/qmockvideosink.h
+++ b/tests/auto/unit/mockbackend/qmockvideosink.h
@@ -53,7 +53,7 @@
 
 #include <private/qplatformvideosink_p.h>
 
-class Q_MULTIMEDIA_EXPORT QMockVideoSink : public QPlatformVideoSink
+class QMockVideoSink : public QPlatformVideoSink
 {
     Q_OBJECT