From fd89c0946a378812121615ab6b8a3ad1ae93d4fb Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@theqtcompany.com>
Date: Tue, 5 Jul 2016 13:21:31 +0200
Subject: DirectShow: correctly clear surface in EVR presenter

The surface was never cleared in the EVR presenter. It could lead to
situations where the presenter would use a destroyed surface.

Change-Id: If2223f09f6f8c20c06345bed40803da10dcf4ae3
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
---
 .../player/directshowvideorenderercontrol.cpp      | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'src/plugins/directshow/player/directshowvideorenderercontrol.cpp')

diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
index 027d2ce55..b5dbfef9e 100644
--- a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
+++ b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
@@ -46,11 +46,20 @@ DirectShowVideoRendererControl::DirectShowVideoRendererControl(DirectShowEventLo
     , m_loop(loop)
     , m_surface(0)
     , m_filter(0)
+#ifdef HAVE_EVR
+    , m_evrPresenter(0)
+#endif
 {
 }
 
 DirectShowVideoRendererControl::~DirectShowVideoRendererControl()
 {
+#ifdef HAVE_EVR
+    if (m_evrPresenter) {
+        m_evrPresenter->setSurface(Q_NULLPTR);
+        m_evrPresenter->Release();
+    }
+#endif
     if (m_filter)
         m_filter->Release();
 }
@@ -65,6 +74,14 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
     if (m_surface == surface)
         return;
 
+#ifdef HAVE_EVR
+    if (m_evrPresenter) {
+        m_evrPresenter->setSurface(Q_NULLPTR);
+        m_evrPresenter->Release();
+        m_evrPresenter = 0;
+    }
+#endif
+
     if (m_filter) {
         m_filter->Release();
         m_filter = 0;
@@ -75,12 +92,13 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
     if (m_surface) {
 #ifdef HAVE_EVR
         m_filter = com_new<IBaseFilter>(clsid_EnhancedVideoRenderer);
-        EVRCustomPresenter *evrPresenter = new EVRCustomPresenter(m_surface);
-        if (!evrPresenter->isValid() || !qt_evr_setCustomPresenter(m_filter, evrPresenter)) {
+        m_evrPresenter = new EVRCustomPresenter(m_surface);
+        if (!m_evrPresenter->isValid() || !qt_evr_setCustomPresenter(m_filter, m_evrPresenter)) {
             m_filter->Release();
             m_filter = 0;
+            m_evrPresenter->Release();
+            m_evrPresenter = 0;
         }
-        evrPresenter->Release();
 
         if (!m_filter)
 #endif
-- 
cgit v1.2.3