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

gst/playback/gstplaybin2.c: Disconnect signal handlers before destroying a previous decodebin so that we don't end up...

Browse source 
Original commit message from CVS:
* gst/playback/gstplaybin2.c: (notify_source_cb), (activate_group):
Disconnect signal handlers before destroying a previous decodebin so
that we don't end up causing deadlocks. Fixes #566586.
This commit is contained in:
Wim Taymans 2009-01-05 12:18:52 +00:00
parent c3ec18af97
commit 8632fc5545
2 changed files with 56 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2009-01-05 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/playback/gstplaybin2.c: (notify_source_cb), (activate_group):
Disconnect signal handlers before destroying a previous decodebin so
that we don't end up causing deadlocks. Fixes #566586.
2009-01-05 Wim Taymans <wim.taymans@collabora.co.uk> 2009-01-05 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/audiotestsrc/gstaudiotestsrc.c: * gst/audiotestsrc/gstaudiotestsrc.c:

69
gst/playback/gstplaybin2.c
View file

@ -303,6 +303,18 @@ struct _GstSourceGroup
GstElement *suburidecodebin; GstElement *suburidecodebin;
gint pending; gint pending;
gulong pad_added_id;
gulong pad_removed_id;
gulong no_more_pads_id;
gulong notify_source_id;
gulong drained_id;
gulong autoplug_factories_id;
gulong autoplug_select_id;
gulong sub_pad_added_id;
gulong sub_pad_removed_id;
gulong sub_no_more_pads_id;
/* selectors for different streams */ /* selectors for different streams */
GstSourceSelect selector[GST_PLAY_SINK_TYPE_LAST]; GstSourceSelect selector[GST_PLAY_SINK_TYPE_LAST];
}; };
@ -2094,7 +2106,7 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
} }
static void static void
notify_source (GstElement * uridecodebin, GParamSpec * pspec, notify_source_cb (GstElement * uridecodebin, GParamSpec * pspec,
GstSourceGroup * group) GstSourceGroup * group)
{ {
GstPlayBin *playbin; GstPlayBin *playbin;
@ -2112,6 +2124,12 @@ notify_source (GstElement * uridecodebin, GParamSpec * pspec,
g_object_notify (G_OBJECT (playbin), "source"); g_object_notify (G_OBJECT (playbin), "source");
} }
#define REMOVE_SIGNAL(obj,id) \
if (id) { \
g_signal_handler_disconnect (obj, id); \
id = 0; \
}
/* must be called with PLAY_BIN_LOCK */ /* must be called with PLAY_BIN_LOCK */
static gboolean static gboolean
activate_group (GstPlayBin * playbin, GstSourceGroup * group) activate_group (GstPlayBin * playbin, GstSourceGroup * group)
@ -2124,6 +2142,13 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group)
GST_SOURCE_GROUP_LOCK (group); GST_SOURCE_GROUP_LOCK (group);
if (group->uridecodebin) { if (group->uridecodebin) {
REMOVE_SIGNAL (group->uridecodebin, group->pad_added_id);
REMOVE_SIGNAL (group->uridecodebin, group->pad_removed_id);
REMOVE_SIGNAL (group->uridecodebin, group->no_more_pads_id);
REMOVE_SIGNAL (group->uridecodebin, group->notify_source_id);
REMOVE_SIGNAL (group->uridecodebin, group->drained_id);
REMOVE_SIGNAL (group->uridecodebin, group->autoplug_factories_id);
REMOVE_SIGNAL (group->uridecodebin, group->autoplug_select_id);
gst_element_set_state (group->uridecodebin, GST_STATE_NULL); gst_element_set_state (group->uridecodebin, GST_STATE_NULL);
gst_bin_remove (GST_BIN_CAST (playbin), group->uridecodebin); gst_bin_remove (GST_BIN_CAST (playbin), group->uridecodebin);
group->uridecodebin = NULL; group->uridecodebin = NULL;
@ -2145,27 +2170,29 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group)
g_object_set (uridecodebin, "buffer-size", playbin->buffer_size, NULL); g_object_set (uridecodebin, "buffer-size", playbin->buffer_size, NULL);
/* connect pads and other things */ /* connect pads and other things */
g_signal_connect (uridecodebin, "pad-added", G_CALLBACK (pad_added_cb), group->pad_added_id = g_signal_connect (uridecodebin, "pad-added",
group); G_CALLBACK (pad_added_cb), group);
g_signal_connect (uridecodebin, "pad-removed", G_CALLBACK (pad_removed_cb), group->pad_removed_id = g_signal_connect (uridecodebin, "pad-removed",
group); G_CALLBACK (pad_removed_cb), group);
g_signal_connect (uridecodebin, "no-more-pads", G_CALLBACK (no_more_pads_cb), group->no_more_pads_id = g_signal_connect (uridecodebin, "no-more-pads",
group); G_CALLBACK (no_more_pads_cb), group);
g_signal_connect (uridecodebin, "notify::source", G_CALLBACK (notify_source), group->notify_source_id = g_signal_connect (uridecodebin, "notify::source",
group); G_CALLBACK (notify_source_cb), group);
/* we have 1 pending no-more-pads */ /* we have 1 pending no-more-pads */
group->pending = 1; group->pending = 1;
/* is called when the uridecodebin is out of data and we can switch to the /* is called when the uridecodebin is out of data and we can switch to the
* next uri */ * next uri */
g_signal_connect (uridecodebin, "drained", G_CALLBACK (drained_cb), group); group->drained_id =
g_signal_connect (uridecodebin, "drained", G_CALLBACK (drained_cb),
group);
/* will be called when a new media type is found. We return a list of decoders /* will be called when a new media type is found. We return a list of decoders
* including sinks for decodebin to try */ * including sinks for decodebin to try */
g_signal_connect (uridecodebin, "autoplug-factories", group->autoplug_factories_id =
g_signal_connect (uridecodebin, "autoplug-factories",
G_CALLBACK (autoplug_factories_cb), group); G_CALLBACK (autoplug_factories_cb), group);
group->autoplug_select_id = g_signal_connect (uridecodebin, "autoplug-select",
g_signal_connect (uridecodebin, "autoplug-select",
G_CALLBACK (autoplug_select_cb), group); G_CALLBACK (autoplug_select_cb), group);
/* */ /* */
@ -2175,6 +2202,9 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group)
if (group->suburi) { if (group->suburi) {
/* subtitles */ /* subtitles */
if (group->suburidecodebin) { if (group->suburidecodebin) {
REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_added_id);
REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_removed_id);
REMOVE_SIGNAL (group->suburidecodebin, group->sub_no_more_pads_id);
gst_element_set_state (group->suburidecodebin, GST_STATE_NULL); gst_element_set_state (group->suburidecodebin, GST_STATE_NULL);
gst_bin_remove (GST_BIN_CAST (playbin), group->suburidecodebin); gst_bin_remove (GST_BIN_CAST (playbin), group->suburidecodebin);
group->suburidecodebin = NULL; group->suburidecodebin = NULL;
@ -2198,12 +2228,13 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group)
group->suburidecodebin = suburidecodebin; group->suburidecodebin = suburidecodebin;
/* connect pads and other things */ /* connect pads and other things */
g_signal_connect (suburidecodebin, "pad-added", G_CALLBACK (pad_added_cb), group->sub_pad_added_id = g_signal_connect (suburidecodebin, "pad-added",
group); G_CALLBACK (pad_added_cb), group);
g_signal_connect (suburidecodebin, "pad-removed", group->sub_pad_removed_id = g_signal_connect (suburidecodebin,
G_CALLBACK (pad_removed_cb), group); "pad-removed", G_CALLBACK (pad_removed_cb), group);
g_signal_connect (suburidecodebin, "no-more-pads", group->sub_no_more_pads_id = g_signal_connect (suburidecodebin,
G_CALLBACK (no_more_pads_cb), group); "no-more-pads", G_CALLBACK (no_more_pads_cb), group);
/* we have 2 pending no-more-pads */ /* we have 2 pending no-more-pads */
group->pending = 2; group->pending = 2;