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

gtkglsink: fix crash when widget is resized after element destruction

Browse source 
Prevent _size_changed_cb() to be called after gtkglsink has been finalized.

Fix #632
This commit is contained in:
Guillaume Desmottes 2019-07-25 21:21:26 +05:30 committed by Matthew Waters
parent 4830bbe6ca
commit 5c4292b019
2 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
ext/gtk/gstgtkglsink.c
View file

@ -43,6 +43,8 @@ static gboolean gst_gtk_gl_sink_propose_allocation (GstBaseSink * bsink,
static GstCaps *gst_gtk_gl_sink_get_caps (GstBaseSink * bsink, static GstCaps *gst_gtk_gl_sink_get_caps (GstBaseSink * bsink,
GstCaps * filter); GstCaps * filter);
static void gst_gtk_gl_sink_finalize (GObject * object);
static GstStaticPadTemplate gst_gtk_gl_sink_template = static GstStaticPadTemplate gst_gtk_gl_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
@ -61,14 +63,18 @@ G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink,
static void static void
gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass) gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
{ {
GObjectClass *gobject_class;
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
GstBaseSinkClass *gstbasesink_class; GstBaseSinkClass *gstbasesink_class;
GstGtkBaseSinkClass *gstgtkbasesink_class; GstGtkBaseSinkClass *gstgtkbasesink_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass; gstbasesink_class = (GstBaseSinkClass *) klass;
gstgtkbasesink_class = (GstGtkBaseSinkClass *) klass; gstgtkbasesink_class = (GstGtkBaseSinkClass *) klass;
gobject_class->finalize = gst_gtk_gl_sink_finalize;
gstbasesink_class->query = gst_gtk_gl_sink_query; gstbasesink_class->query = gst_gtk_gl_sink_query;
gstbasesink_class->propose_allocation = gst_gtk_gl_sink_propose_allocation; gstbasesink_class->propose_allocation = gst_gtk_gl_sink_propose_allocation;
gstbasesink_class->start = gst_gtk_gl_sink_start; gstbasesink_class->start = gst_gtk_gl_sink_start;
@ -138,6 +144,20 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * rectangle,
} }
} }
static void
destroy_cb (GtkWidget * widget, GstGtkGLSink * gtk_sink)
{
if (gtk_sink->size_allocate_sig_handler) {
g_signal_handler_disconnect (widget, gtk_sink->size_allocate_sig_handler);
gtk_sink->size_allocate_sig_handler = 0;
}
if (gtk_sink->widget_destroy_sig_handler) {
g_signal_handler_disconnect (widget, gtk_sink->widget_destroy_sig_handler);
gtk_sink->widget_destroy_sig_handler = 0;
}
}
static gboolean static gboolean
gst_gtk_gl_sink_start (GstBaseSink * bsink) gst_gtk_gl_sink_start (GstBaseSink * bsink)
{ {
@ -152,8 +172,14 @@ gst_gtk_gl_sink_start (GstBaseSink * bsink)
gst_widget = GTK_GST_GL_WIDGET (base_sink->widget); gst_widget = GTK_GST_GL_WIDGET (base_sink->widget);
/* Track the allocation size */ /* Track the allocation size */
g_signal_connect (gst_widget, "size-allocate", G_CALLBACK (_size_changed_cb), gtk_sink->size_allocate_sig_handler =
g_signal_connect (gst_widget, "size-allocate",
G_CALLBACK (_size_changed_cb), gtk_sink);
gtk_sink->widget_destroy_sig_handler =
g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
gtk_sink); gtk_sink);
_size_changed_cb (GTK_WIDGET (gst_widget), NULL, gtk_sink); _size_changed_cb (GTK_WIDGET (gst_widget), NULL, gtk_sink);
if (!gtk_gst_gl_widget_init_winsys (gst_widget)) { if (!gtk_gst_gl_widget_init_winsys (gst_widget)) {
@ -315,3 +341,24 @@ gst_gtk_gl_sink_get_caps (GstBaseSink * bsink, GstCaps * filter)
return result; return result;
} }
static void
gst_gtk_gl_sink_finalize (GObject * object)
{
GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (object);
GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (object);
if (gtk_sink->size_allocate_sig_handler) {
g_signal_handler_disconnect (base_sink->widget,
gtk_sink->size_allocate_sig_handler);
gtk_sink->size_allocate_sig_handler = 0;
}
if (gtk_sink->widget_destroy_sig_handler) {
g_signal_handler_disconnect (base_sink->widget,
gtk_sink->widget_destroy_sig_handler);
gtk_sink->widget_destroy_sig_handler = 0;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}

3
ext/gtk/gstgtkglsink.h
View file

@ -64,6 +64,9 @@ struct _GstGtkGLSink
/* read/write with object lock */ /* read/write with object lock */
gint display_width; gint display_width;
gint display_height; gint display_height;
gulong size_allocate_sig_handler;
gulong widget_destroy_sig_handler;
}; };
/** /**