wtay gst-plugins-base: gst-plugins-base/ gst-plugins-base/gst/playback/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     wtay
Date:           Mon Jan 05 2009  12:19:06 UTC

Log message:
* 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.

Modified files:
    .               : ChangeLog
    gst/playback    : gstplaybin2.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4269&r2=1.4270
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/playback/gstplaybin2.c.diff?r1=1.31&r2=1.32

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4269
retrieving revision 1.4270
diff -u -d -r1.4269 -r1.4270
--- ChangeLog	5 Jan 2009 10:59:33 -0000	1.4269
+++ ChangeLog	5 Jan 2009 12:18:50 -0000	1.4270
@@ -1,5 +1,11 @@
 2009-01-05  Wim Taymans  <[email protected]>
 
+	* 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  <[email protected]>
 	* gst/audiotestsrc/gstaudiotestsrc.c:
 	(gst_audio_test_src_class_init), (gst_audio_test_src_init),
 	(gst_audio_test_src_check_get_range),
Index: gstplaybin2.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gstplaybin2.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gstplaybin2.c	20 Dec 2008 12:48:43 -0000	1.31
+++ gstplaybin2.c	5 Jan 2009 12:18:52 -0000	1.32
@@ -303,6 +303,18 @@
   GstElement *suburidecodebin;
   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 */
   GstSourceSelect selector[GST_PLAY_SINK_TYPE_LAST];
 };
@@ -2094,7 +2106,7 @@
 }
 static void
-notify_source (GstElement * uridecodebin, GParamSpec * pspec,
+notify_source_cb (GstElement * uridecodebin, GParamSpec * pspec,
     GstSourceGroup * group)
 {
   GstPlayBin *playbin;
@@ -2112,6 +2124,12 @@
   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 */
 static gboolean
 activate_group (GstPlayBin * playbin, GstSourceGroup * group)
@@ -2124,6 +2142,13 @@
   GST_SOURCE_GROUP_LOCK (group);
   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_bin_remove (GST_BIN_CAST (playbin), group->uridecodebin);
     group->uridecodebin = NULL;
@@ -2145,27 +2170,29 @@
   g_object_set (uridecodebin, "buffer-size", playbin->buffer_size, NULL);
   /* connect pads and other things */
-  g_signal_connect (uridecodebin, "pad-added", G_CALLBACK (pad_added_cb),
-      group);
-  g_signal_connect (uridecodebin, "pad-removed", G_CALLBACK (pad_removed_cb),
-  g_signal_connect (uridecodebin, "no-more-pads", G_CALLBACK (no_more_pads_cb),
-  g_signal_connect (uridecodebin, "notify::source", G_CALLBACK (notify_source),
+  group->pad_added_id = g_signal_connect (uridecodebin, "pad-added",
+      G_CALLBACK (pad_added_cb), group);
+  group->pad_removed_id = g_signal_connect (uridecodebin, "pad-removed",
+      G_CALLBACK (pad_removed_cb), group);
+  group->no_more_pads_id = g_signal_connect (uridecodebin, "no-more-pads",
+      G_CALLBACK (no_more_pads_cb), group);
+  group->notify_source_id = g_signal_connect (uridecodebin, "notify::source",
+      G_CALLBACK (notify_source_cb), group);
   /* we have 1 pending no-more-pads */
   group->pending = 1;
   /* is called when the uridecodebin is out of data and we can switch to the
    * 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
    * 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_signal_connect (uridecodebin, "autoplug-select",
+  group->autoplug_select_id = g_signal_connect (uridecodebin, "autoplug-select",
       G_CALLBACK (autoplug_select_cb), group);
   /*  */
@@ -2175,6 +2202,9 @@
   if (group->suburi) {
     /* subtitles */
     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_bin_remove (GST_BIN_CAST (playbin), group->suburidecodebin);
       group->suburidecodebin = NULL;
@@ -2198,12 +2228,13 @@
     group->suburidecodebin = suburidecodebin;
     /* connect pads and other things */
-    g_signal_connect (suburidecodebin, "pad-added", G_CALLBACK (pad_added_cb),
-        group);
-    g_signal_connect (suburidecodebin, "pad-removed",
-        G_CALLBACK (pad_removed_cb), group);
-    g_signal_connect (suburidecodebin, "no-more-pads",
-        G_CALLBACK (no_more_pads_cb), group);
+    group->sub_pad_added_id = g_signal_connect (suburidecodebin, "pad-added",
+        G_CALLBACK (pad_added_cb), group);
+    group->sub_pad_removed_id = g_signal_connect (suburidecodebin,
+        "pad-removed", G_CALLBACK (pad_removed_cb), group);
+    group->sub_no_more_pads_id = g_signal_connect (suburidecodebin,
+        "no-more-pads", G_CALLBACK (no_more_pads_cb), group);
     /* we have 2 pending no-more-pads */
     group->pending = 2;

------------------------------------------------------------------------------