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

WMF: Fixed shutdown sequence.

Browse Source 
A wrong shutdown sequence was causing a wait condition to never be met,
resulting in a 5 seconds hang on shutdown.
Also reduced the wait condition timeout to 100 ms.

Task-number: QTBUG-28432

Change-Id: Ib415bf66634603d839be3e34e497e3a3c5a19ad9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Jason Barron <jason@cutehacks.com>
This commit is contained in:
Yoann Lopes
2012-12-06 15:42:47 +01:00
committed by The Qt Project
parent 31fdbb1c22
commit ad83534736
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/wmf/player/mfplayerservice.cpp
View File

@@ -71,6 +71,8 @@ MFPlayerService::MFPlayerService(QObject *parent)
MFPlayerService::~MFPlayerService() MFPlayerService::~MFPlayerService()
{ {
m_session->close();
#ifndef Q_WS_SIMULATOR #ifndef Q_WS_SIMULATOR
if (m_videoWindowControl) if (m_videoWindowControl)
delete m_videoWindowControl; delete m_videoWindowControl;
@@ -79,7 +81,6 @@ MFPlayerService::~MFPlayerService()
if (m_videoRendererControl) if (m_videoRendererControl)
delete m_videoRendererControl; delete m_videoRendererControl;
m_session->close();
m_session->Release(); m_session->Release();
} }

2
src/plugins/wmf/player/mfplayersession.cpp
View File

@@ -454,7 +454,7 @@ void MFPlayerSession::close()
if (m_session) { if (m_session) {
hr = m_session->Close(); hr = m_session->Close();
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 5000); DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 100);
if (dwWaitResult == WAIT_TIMEOUT) { if (dwWaitResult == WAIT_TIMEOUT) {
qWarning() << "session close time out!"; qWarning() << "session close time out!";
} }

2
src/plugins/wmf/wmfserviceplugin.cpp
View File

@@ -92,8 +92,8 @@ QMediaService* WMFServicePlugin::create(QString const& key)
void WMFServicePlugin::release(QMediaService *service) void WMFServicePlugin::release(QMediaService *service)
{ {
releaseRefCount();
delete service; delete service;
releaseRefCount();
} }
QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures( QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures(