mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11: Fix deadlock while doing unprepare

Browse source 
ShowWindow() could be blocked while doing gst_d3d11_window_win32_unprepare
when external window handle provided to d3d11videosink in multi-threaded
environment.
The condition that issue happened is, UI thread is waiting for a
background thread that changes d3d11videosink state to NULL, and the
background thread would try to send a window message to the queue.
The queue is already occupied by the UI thread, so the background
thread will be blocked.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1366>
This commit is contained in:
Wonchul Lee 2021-11-19 13:27:54 +09:00
parent 0b0bc5956d
commit ae7a365274
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
subprojects/gst-plugins-bad/sys/d3d11/gstd3d11window_win32.cpp
View file

@ -208,7 +208,6 @@ gst_d3d11_window_win32_unprepare (GstD3D11Window * window)
if (self->external_hwnd) { if (self->external_hwnd) {
gst_d3d11_window_win32_release_external_handle (self->external_hwnd); gst_d3d11_window_win32_release_external_handle (self->external_hwnd);
RemoveProp (self->internal_hwnd, D3D11_WINDOW_PROP_NAME); RemoveProp (self->internal_hwnd, D3D11_WINDOW_PROP_NAME);
ShowWindow (self->internal_hwnd, SW_HIDE);
if (self->internal_hwnd_thread == g_thread_self ()) { if (self->internal_hwnd_thread == g_thread_self ()) {
/* State changing thread is identical to internal window thread. /* State changing thread is identical to internal window thread.