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

DirectShow: fix deadlock in VideoSurfaceFilter

Browse Source 
When the DirectShow graph is done being built, there's no need to wake
up any blocking calls on the main thread since setting a source is done
asynchronously anyway.
This could cause synchronous operations (like stopping or changing the
video output) to end prematurely if called while a source was still
being loaded, in turn causing the deadlock.

Task-number: QTBUG-54504
Change-Id: I4f534e637bfca6d3020a3bc28725c8c7042941d5
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
This commit is contained in:
Yoann Lopes
2016-07-05 14:07:28 +02:00
committed by Yoann Lopes
parent fa91fc211c
commit 7fb7f278ff
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/directshow/player/directshowplayerservice.cpp
View File

@@ -535,8 +535,6 @@ void DirectShowPlayerService::doRender(QMutexLocker *locker)
m_executedTasks |= Render;
}
m_loop->wake();
}
void DirectShowPlayerService::doFinalizeLoad(QMutexLocker *locker)