mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

vkdisplay: hold a weakref on the list of windows

Browse source 
It's possible that the window may have been destroyed when a winsys
event comes in for it.

Fixes an assertion in make -C tests/check generic/states.check
This commit is contained in:
Matthew Waters 2016-10-05 12:11:19 +11:00
parent 1b3de55eb1
commit 4e3cb77fa8
1 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ext/vulkan/vkdisplay.c
View file

@ -284,8 +284,12 @@ gst_vulkan_display_create_window (GstVulkanDisplay * display)
window = klass->create_window (display); window = klass->create_window (display);
if (window) { if (window) {
GWeakRef *ref = g_new0 (GWeakRef, 1);
g_weak_ref_set (ref, window);
GST_OBJECT_LOCK (display); GST_OBJECT_LOCK (display);
display->windows = g_list_prepend (display->windows, window); display->windows = g_list_prepend (display->windows, ref);
GST_OBJECT_UNLOCK (display); GST_OBJECT_UNLOCK (display);
} }
@ -298,6 +302,31 @@ gst_vulkan_display_default_create_window (GstVulkanDisplay * display)
return gst_vulkan_window_new (display); return gst_vulkan_window_new (display);
} }
static gint
_compare_vulkan_window (GWeakRef * ref, GstVulkanWindow * window)
{
GstVulkanWindow *other = g_weak_ref_get (ref);
gboolean equal = window == other;
gst_object_unref (other);
return !equal;
}
static GList *
_find_window_list_item (GstVulkanDisplay * display, GstVulkanWindow * window)
{
GList *l;
if (!window)
return NULL;
l = g_list_find_custom (display->windows, window,
(GCompareFunc) _compare_vulkan_window);
return l;
}
gboolean gboolean
gst_vulkan_display_remove_window (GstVulkanDisplay * display, gst_vulkan_display_remove_window (GstVulkanDisplay * display,
GstVulkanWindow * window) GstVulkanWindow * window)
@ -306,9 +335,11 @@ gst_vulkan_display_remove_window (GstVulkanDisplay * display,
GList *l; GList *l;
GST_OBJECT_LOCK (display); GST_OBJECT_LOCK (display);
l = g_list_find (display->windows, window); l = _find_window_list_item (display, window);
if (l) { if (l) {
display->windows = g_list_delete_link (display->windows, l); display->windows = g_list_delete_link (display->windows, l);
g_weak_ref_clear (l->data);
g_free (l->data);
ret = TRUE; ret = TRUE;
} }
GST_OBJECT_UNLOCK (display); GST_OBJECT_UNLOCK (display);