slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DirectShow: correctly clear surface in EVR presenter

Browse Source 
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>
This commit is contained in:
Yoann Lopes
2016-07-05 13:21:31 +02:00
committed by Yoann Lopes
parent 443ed0be09
commit fd89c0946a
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/directshow/player/directshowvideorenderercontrol.cpp
View File

@@ -46,11 +46,20 @@ DirectShowVideoRendererControl::DirectShowVideoRendererControl(DirectShowEventLo
, m_loop(loop) , m_loop(loop)
, m_surface(0) , m_surface(0)
, m_filter(0) , m_filter(0)
#ifdef HAVE_EVR
, m_evrPresenter(0)
#endif
{ {
} }
DirectShowVideoRendererControl::~DirectShowVideoRendererControl() DirectShowVideoRendererControl::~DirectShowVideoRendererControl()
{ {
#ifdef HAVE_EVR
if (m_evrPresenter) {
m_evrPresenter->setSurface(Q_NULLPTR);
m_evrPresenter->Release();
}
#endif
if (m_filter) if (m_filter)
m_filter->Release(); m_filter->Release();
} }
@@ -65,6 +74,14 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
if (m_surface == surface) if (m_surface == surface)
return; return;
#ifdef HAVE_EVR
if (m_evrPresenter) {
m_evrPresenter->setSurface(Q_NULLPTR);
m_evrPresenter->Release();
m_evrPresenter = 0;
}
#endif
if (m_filter) { if (m_filter) {
m_filter->Release(); m_filter->Release();
m_filter = 0; m_filter = 0;
@@ -75,12 +92,13 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
if (m_surface) { if (m_surface) {
#ifdef HAVE_EVR #ifdef HAVE_EVR
m_filter = com_new<IBaseFilter>(clsid_EnhancedVideoRenderer); m_filter = com_new<IBaseFilter>(clsid_EnhancedVideoRenderer);
EVRCustomPresenter *evrPresenter = new EVRCustomPresenter(m_surface); m_evrPresenter = new EVRCustomPresenter(m_surface);
if (!evrPresenter->isValid() || !qt_evr_setCustomPresenter(m_filter, evrPresenter)) { if (!m_evrPresenter->isValid() || !qt_evr_setCustomPresenter(m_filter, m_evrPresenter)) {
m_filter->Release(); m_filter->Release();
m_filter = 0; m_filter = 0;
m_evrPresenter->Release();
m_evrPresenter = 0;
} }
evrPresenter->Release();
if (!m_filter) if (!m_filter)
#endif #endif

6
src/plugins/directshow/player/directshowvideorenderercontrol.h
View File

@@ -39,6 +39,9 @@
#include "qvideorenderercontrol.h" #include "qvideorenderercontrol.h"
class DirectShowEventLoop; class DirectShowEventLoop;
#ifdef HAVE_EVR
class EVRCustomPresenter;
#endif
QT_USE_NAMESPACE QT_USE_NAMESPACE
@@ -61,6 +64,9 @@ private:
DirectShowEventLoop *m_loop; DirectShowEventLoop *m_loop;
QAbstractVideoSurface *m_surface; QAbstractVideoSurface *m_surface;
IBaseFilter *m_filter; IBaseFilter *m_filter;
#ifdef HAVE_EVR
EVRCustomPresenter *m_evrPresenter;
#endif
}; };
#endif #endif