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

gtkbasesink: Fix widget leak

Browse source 
gst_gtk_base_sink_get_widget() will increase refcount and it should
be released after use

Fixing regression introduced by the commit
941c0e81dd

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3644>
This commit is contained in:
Seungha Yang 2022-12-26 23:00:18 +09:00 committed by GStreamer Marge Bot
parent 15caeb4ac9
commit ce2c294117
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-good/ext/gtk/gstgtkbasesink.c
View file

@ -230,7 +230,8 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sink)
/* Take the floating ref, other wise the destruction of the container will /* Take the floating ref, other wise the destruction of the container will
* make this widget disappear possibly before we are done. */ * make this widget disappear possibly before we are done. */
gst_object_ref_sink (gtk_sink->widget); g_object_ref_sink (gtk_sink->widget);
gtk_sink->widget_destroy_id = g_signal_connect (gtk_sink->widget, "destroy", gtk_sink->widget_destroy_id = g_signal_connect (gtk_sink->widget, "destroy",
G_CALLBACK (widget_destroy_cb), gtk_sink); G_CALLBACK (widget_destroy_cb), gtk_sink);
@ -339,6 +340,7 @@ gst_gtk_base_sink_navigation_send_event (GstNavigation * navigation,
gtk_gst_base_widget_display_size_to_stream_size (widget, gtk_gst_base_widget_display_size_to_stream_size (widget,
x, y, &stream_x, &stream_y); x, y, &stream_x, &stream_y);
gst_navigation_event_set_coordinates (event, stream_x, stream_y); gst_navigation_event_set_coordinates (event, stream_x, stream_y);
g_object_unref (widget);
} }
pad = gst_pad_get_peer (GST_VIDEO_SINK_PAD (sink)); pad = gst_pad_get_peer (GST_VIDEO_SINK_PAD (sink));
@ -370,8 +372,10 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink); GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
GstGtkBaseSinkClass *klass = GST_GTK_BASE_SINK_GET_CLASS (bsink); GstGtkBaseSinkClass *klass = GST_GTK_BASE_SINK_GET_CLASS (bsink);
GtkWidget *toplevel; GtkWidget *toplevel;
GtkGstBaseWidget *widget;
if (gst_gtk_base_sink_get_widget (gst_sink) == NULL) { widget = gst_gtk_base_sink_get_widget (gst_sink);
if (!widget) {
GST_ERROR_OBJECT (bsink, "Could not ensure GTK initialization."); GST_ERROR_OBJECT (bsink, "Could not ensure GTK initialization.");
return FALSE; return FALSE;
} }
@ -393,6 +397,8 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
G_CALLBACK (window_destroy_cb), gst_sink); G_CALLBACK (window_destroy_cb), gst_sink);
} }
g_object_unref (widget);
return TRUE; return TRUE;
} }