Windows: Improve EVR presenter.

Removed hard dependency to Angle; it's now required only when rendering
to a texture. If Angle is not used, the buffers are now mappable to
system memory.

This enables HW-accelerated video decoding in QML for non-ANGLE
builds. Note that the frame data have to do a round-trip through system
memory, which is not ideal but still faster than SW decoding.

Task-number: QTBUG-45593
Change-Id: Icc3503142df4e8dbb53b4e11f409b161fd2f9bde
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

2 files changed, 10 insertions, 37 deletions

diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.cpp b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
index 365cf537d..766b4b0d9 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.cpp
+++ b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
@@ -34,9 +34,7 @@
 #include "mfvideorenderercontrol.h"
 #include "mfactivate.h"
 
-#ifdef CUSTOM_EVR_PRESENTER
 #include "evrcustompresenter.h"
-#endif
 
 #include <qabstractvideosurface.h>
 #include <qvideosurfaceformat.h>
@@ -2222,7 +2220,6 @@ namespace
     };
 }
 
-#ifdef CUSTOM_EVR_PRESENTER
 
 class EVRCustomPresenterActivate : public MFAbstractActivate
 {
@@ -2243,16 +2240,13 @@ private:
     QMutex m_mutex;
 };
 
-#endif // CUSTOM_EVR_PRESENTER
 
 MFVideoRendererControl::MFVideoRendererControl(QObject *parent)
     : QVideoRendererControl(parent)
     , m_surface(0)
     , m_currentActivate(0)
     , m_callback(0)
-#ifdef CUSTOM_EVR_PRESENTER
     , m_presenterActivate(0)
-#endif
 {
 }
 
@@ -2266,13 +2260,11 @@ void MFVideoRendererControl::clear()
     if (m_surface)
         m_surface->stop();
 
-#ifdef CUSTOM_EVR_PRESENTER
     if (m_presenterActivate) {
         m_presenterActivate->ShutdownObject();
         m_presenterActivate->Release();
         m_presenterActivate = NULL;
     }
-#endif
 
     if (m_currentActivate) {
         m_currentActivate->ShutdownObject();
@@ -2301,21 +2293,16 @@ void MFVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
         connect(m_surface, SIGNAL(supportedFormatsChanged()), this, SLOT(supportedFormatsChanged()));
     }
 
-#ifdef CUSTOM_EVR_PRESENTER
     if (m_presenterActivate)
         m_presenterActivate->setSurface(m_surface);
-    else
-#endif
-    if (m_currentActivate)
+    else if (m_currentActivate)
         static_cast<VideoRendererActivate*>(m_currentActivate)->setSurface(m_surface);
 }
 
 void MFVideoRendererControl::customEvent(QEvent *event)
 {
-#ifdef CUSTOM_EVR_PRESENTER
     if (m_presenterActivate)
         return;
-#endif
 
     if (!m_currentActivate)
         return;
@@ -2346,16 +2333,17 @@ void MFVideoRendererControl::customEvent(QEvent *event)
 
 void MFVideoRendererControl::supportedFormatsChanged()
 {
+    if (m_presenterActivate)
+        return;
+
     if (m_currentActivate)
         static_cast<VideoRendererActivate*>(m_currentActivate)->supportedFormatsChanged();
 }
 
 void MFVideoRendererControl::present()
 {
-#ifdef CUSTOM_EVR_PRESENTER
     if (m_presenterActivate)
         return;
-#endif
 
     if (m_currentActivate)
         static_cast<VideoRendererActivate*>(m_currentActivate)->present();
@@ -2367,28 +2355,19 @@ IMFActivate* MFVideoRendererControl::createActivate()
 
     clear();
 
-#ifdef CUSTOM_EVR_PRESENTER
-    // We can use the EVR with our custom presenter only if the surface supports OpenGL
-    // texture handles. We also require ANGLE (due to the D3D interop).
-    if (!m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).isEmpty()
-        && QMediaOpenGLHelper::isANGLE()) {
-        // Create the EVR media sink, but replace the presenter with our own
-        if (SUCCEEDED(MFCreateVideoRendererActivate(::GetShellWindow(), &m_currentActivate))) {
-            m_presenterActivate = new EVRCustomPresenterActivate;
-            m_currentActivate->SetUnknown(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, m_presenterActivate);
-        }
-    }
-#endif
-
-    if (!m_currentActivate)
+    // Create the EVR media sink, but replace the presenter with our own
+    if (SUCCEEDED(MFCreateVideoRendererActivate(::GetShellWindow(), &m_currentActivate))) {
+        m_presenterActivate = new EVRCustomPresenterActivate;
+        m_currentActivate->SetUnknown(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, m_presenterActivate);
+    } else {
         m_currentActivate = new VideoRendererActivate(this);
+    }
 
     setSurface(m_surface);
 
     return m_currentActivate;
 }
 
-#ifdef CUSTOM_EVR_PRESENTER
 
 EVRCustomPresenterActivate::EVRCustomPresenterActivate()
     : MFAbstractActivate()
@@ -2438,7 +2417,5 @@ void EVRCustomPresenterActivate::setSurface(QAbstractVideoSurface *surface)
         m_presenter->setSurface(surface);
 }
 
-#endif // CUSTOM_EVR_PRESENTER
-
 #include "moc_mfvideorenderercontrol.cpp"
 #include "mfvideorenderercontrol.moc"
diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.h b/src/plugins/wmf/player/mfvideorenderercontrol.h
index 8ef4feeef..224fcea51 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.h
+++ b/src/plugins/wmf/player/mfvideorenderercontrol.h
@@ -40,9 +40,7 @@
 
 QT_USE_NAMESPACE
 
-#ifdef CUSTOM_EVR_PRESENTER
 class EVRCustomPresenterActivate;
-#endif
 
 class MFVideoRendererControl : public QVideoRendererControl
 {
@@ -71,9 +69,7 @@ private:
     IMFActivate *m_currentActivate;
     IMFSampleGrabberSinkCallback *m_callback;
 
-#ifdef CUSTOM_EVR_PRESENTER
     EVRCustomPresenterActivate *m_presenterActivate;
-#endif
 };
 
 #endif