Update code to reflect changes in the API of the referenced classes

Change-Id: I03a6d8ba1ee4efea5a236b561ba1b77eba8ecdf0
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 9 insertions, 18 deletions

diff --git a/src/multimedia/platform/windows/evr/evrcustompresenter.cpp b/src/multimedia/platform/windows/evr/evrcustompresenter.cpp
index 16e87eb51..372bf88e1 100644
--- a/src/multimedia/platform/windows/evr/evrcustompresenter.cpp
+++ b/src/multimedia/platform/windows/evr/evrcustompresenter.cpp
@@ -42,6 +42,8 @@
 #include "evrd3dpresentengine_p.h"
 #include "evrhelpers_p.h"
 
+#include <QtGui/private/qrhi_p.h>
+
 #include <QtCore/qmutex.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qrect.h>
@@ -1025,7 +1027,7 @@ void EVRCustomPresenter::supportedFormatsChanged()
 
     // check if we can render to the surface (compatible formats)
     if (m_videoSink) {
-        if (m_presentEngine->supportsTextureRendering() && m_videoSink->graphicsType() == QVideoSink::OpenGL) {
+        if (m_presentEngine->supportsTextureRendering() && m_videoSink->rhi() && m_videoSink->rhi()->backend() == QRhi::OpenGLES2) {
             m_presentEngine->setHint(D3DPresentEngine::RenderToTexture, true);
             m_canRenderToSurface = true;
         } else {
diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp
index 9cc2e967c..951208598 100644
--- a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp
+++ b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp
@@ -86,8 +86,6 @@ public:
             m_sample->Release();
     }
 
-    QVariant handle() const override;
-
     QVideoFrame::MapMode mapMode() const override { return m_mapMode; }
     MapData map(QVideoFrame::MapMode mode) override;
     void unmap() override;
@@ -132,12 +130,6 @@ void IMFSampleVideoBuffer::unmap()
     m_surface->UnlockRect();
 }
 
-QVariant IMFSampleVideoBuffer::handle() const
-{
-    return m_textureId;
-}
-
-
 D3DPresentEngine::D3DPresentEngine()
     : m_deviceResetToken(0)
     , m_D3D9(0)
@@ -384,7 +376,7 @@ QVideoFrame D3DPresentEngine::makeVideoFrame(IMFSample *sample)
     if (!sample)
         return QVideoFrame();
 
-    QVideoFrame frame(new IMFSampleVideoBuffer(this, sample, (m_useTextureRendering ? QVideoFrame::GLTextureHandle : QVideoFrame::NoHandle)),
+    QVideoFrame frame(new IMFSampleVideoBuffer(this, sample, (m_useTextureRendering ? QVideoFrame::RhiTextureHandle : QVideoFrame::NoHandle)),
                       m_surfaceFormat);
 
     // WMF uses 100-nanosecond units, Qt uses microseconds
diff --git a/src/multimedia/platform/windows/evr/evrvideowindowcontrol.cpp b/src/multimedia/platform/windows/evr/evrvideowindowcontrol.cpp
index 4b8e6dc0f..18f883289 100644
--- a/src/multimedia/platform/windows/evr/evrvideowindowcontrol.cpp
+++ b/src/multimedia/platform/windows/evr/evrvideowindowcontrol.cpp
@@ -136,9 +136,6 @@ void EvrVideoWindowControl::setDisplayRect(const QRect &rect)
         } else {
             m_displayControl->SetVideoPosition(NULL, &displayRect);
         }
-
-        // To refresh content immediately.
-        repaint();
     }
 }
 
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol.cpp b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
index 88fbef38d..f09da5cc0 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol.cpp
+++ b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
@@ -141,7 +141,7 @@ void MFPlayerControl::setVideoSink(QVideoSink *sink)
     m_session->setVideoSink(sink);
 }
 
-void MFPlayerControl::changeState(QMediaPlayer::State state)
+void MFPlayerControl::changeState(QMediaPlayer::PlaybackState state)
 {
     if (m_state == state)
         return;
@@ -227,7 +227,7 @@ void MFPlayerControl::handleSeekableUpdate(bool seekable)
     emit seekableChanged(m_seekable);
 }
 
-QMediaPlayer::State MFPlayerControl::state() const
+QMediaPlayer::PlaybackState MFPlayerControl::state() const
 {
     return m_state;
 }
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol_p.h b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
index 05c5482c5..a3a0f318e 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol_p.h
+++ b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
@@ -66,7 +66,7 @@ public:
     MFPlayerControl(QMediaPlayer *player);
     ~MFPlayerControl();
 
-    QMediaPlayer::State state() const override;
+    QMediaPlayer::PlaybackState state() const override;
 
     QMediaPlayer::MediaStatus mediaStatus() const override;
 
@@ -118,11 +118,11 @@ public:
     void handleError(QMediaPlayer::Error errorCode, const QString& errorString, bool isFatal);
 
 private:
-    void changeState(QMediaPlayer::State state);
+    void changeState(QMediaPlayer::PlaybackState state);
     void resetAudioVideoAvailable();
     void refreshState();
 
-    QMediaPlayer::State m_state;
+    QMediaPlayer::PlaybackState m_state;
     bool m_stateDirty;
     QMediaPlayer::MediaStatus m_status;
     QMediaPlayer::Error m_error;