mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 18:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11window_win32: fix crash on RC unprepare() vs window_proc()

Browse source 
Unprepare method posts WM_GST_D3D11_DESTROY_INTERNAL_WINDOW
command to the window queue, and from that moment considers
internal_hwnd to be released, and so it sets it to null.
The problem is that it's possible that right at that moment
the window thread might be already processing some other
command, or just another command might be already in the queue.
On practice we met a crash when WM_PAINT got processed in between
(unprepare already finished and WM_GST_D3D11_DESTROY_INTERNAL_WINDOW
was not handled yet)

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6187>
This commit is contained in:
Alexander Slobodeniuk 2024-02-22 15:41:16 +01:00 committed by GStreamer Marge Bot
parent 49fa99737b
commit f92c27a49e
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ struct _GstD3D11WindowWin32
GThread *internal_hwnd_thread;
GRecMutex hwnds_lock;
HWND internal_hwnd;
HWND external_hwnd;
GstD3D11WindowWin32OverlayState overlay_state;
@ -104,7 +105,7 @@ G_DEFINE_TYPE (GstD3D11WindowWin32, gst_d3d11_window_win32,
GST_TYPE_D3D11_WINDOW);
static void gst_d3d11_window_win32_constructed (GObject * object);
static void gst_d3d11_window_win32_dispose (GObject * object);
static void gst_d3d11_window_win32_finalize (GObject * object);
static void gst_d3d11_window_win32_show (GstD3D11Window * window);
static void gst_d3d11_window_win32_update_swap_chain (GstD3D11Window * window);
@ -148,7 +149,7 @@ gst_d3d11_window_win32_class_init (GstD3D11WindowWin32Class * klass)
GstD3D11WindowClass *window_class = GST_D3D11_WINDOW_CLASS (klass);
gobject_class->constructed = gst_d3d11_window_win32_constructed;
gobject_class->dispose = gst_d3d11_window_win32_dispose;
gobject_class->finalize = gst_d3d11_window_win32_finalize;
window_class->show = GST_DEBUG_FUNCPTR (gst_d3d11_window_win32_show);
window_class->update_swap_chain =
@ -177,6 +178,7 @@ gst_d3d11_window_win32_init (GstD3D11WindowWin32 * self)
{
self->main_context = g_main_context_new ();
self->restore_placement.length = sizeof (WINDOWPLACEMENT);
g_rec_mutex_init (&self->hwnds_lock);
}
static void
@ -205,11 +207,14 @@ done:
}
static void
gst_d3d11_window_win32_dispose (GObject * object)
gst_d3d11_window_win32_finalize (GObject * object)
{
GST_DEBUG_OBJECT (object, "dispose");
GstD3D11WindowWin32 *self = (GstD3D11WindowWin32 *) object;
GST_DEBUG_OBJECT (object, "finalize");
gst_d3d11_window_win32_unprepare (GST_D3D11_WINDOW (object));
G_OBJECT_CLASS (parent_class)->dispose (object);
g_rec_mutex_clear (&self->hwnds_lock);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static GstFlowReturn
@ -287,9 +292,13 @@ gst_d3d11_window_win32_unprepare (GstD3D11Window * window)
0, 0);
}
/* Hold hwnds lock to allow the window thread finish processing what it could
* already have in the queue at this moment, before we reset the handlers to null */
g_rec_mutex_lock (&self->hwnds_lock);
self->external_hwnd = NULL;
self->internal_hwnd = NULL;
self->internal_hwnd_thread = NULL;
g_rec_mutex_unlock (&self->hwnds_lock);
}
if (self->loop) {
@ -859,10 +868,19 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetPropA (hWnd, D3D11_WINDOW_PROP_NAME, self);
} else if ((self = gst_d3d11_window_win32_hwnd_get_instance (hWnd))) {
g_assert (self->internal_hwnd == hWnd);
g_rec_mutex_lock (&self->hwnds_lock);
if (self->internal_hwnd != hWnd) {
g_warn_if_fail (self->internal_hwnd == NULL);
/* Most likely the instance is already in the destruction proccess,
* just let it process WM_GST_D3D11_DESTROY_INTERNAL_WINDOW */
g_rec_mutex_unlock (&self->hwnds_lock);
gst_object_unref (self);
return DefWindowProcA (hWnd, uMsg, wParam, lParam);
}
gst_d3d11_window_win32_handle_window_proc (self, hWnd, uMsg, wParam,
lParam);
g_rec_mutex_unlock (&self->hwnds_lock);
switch (uMsg) {
case WM_SIZE: