ext/metadata/gstbasemetadata.c: Avoid deadlock during pad activation.

Original commit message from CVS:
* ext/metadata/gstbasemetadata.c:
Avoid deadlock during pad activation.
Fixes #561241.

diff --git a/ChangeLog b/ChangeLog
index 857c672d4126981d0ef7832161efafd9c452e6bb..31348bbe222199d32b5d354b6815559b770adfa5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-18  Alessandro Decina  <alessandro.d@gmail.com>
+
+       * ext/metadata/gstbasemetadata.c:
+       Avoid deadlock during pad activation.
+       Fixes #561241.
+
 2008-11-17  David Schleef  <ds@schleef.org>
 
        * gst/qtmux/gstqtmux.c: Quiet a debugging message that I recently

diff --git a/ext/metadata/gstbasemetadata.c b/ext/metadata/gstbasemetadata.c
index e86c9ce187bd136fd2daec81252b94bcd93ddfac..0e4eb5120576cd18e0fb39a0d5cb9a87a874dc41 100644 (file)
--- a/ext/metadata/gstbasemetadata.c
+++ b/ext/metadata/gstbasemetadata.c
@@ -1807,16 +1807,24 @@ gst_base_metadata_sink_activate (GstPad * pad)
   }
 
   if (ret) {
-    gst_pad_activate_pull (pad, FALSE);
-    gst_pad_activate_push (filter->srcpad, FALSE);
-    if (!gst_pad_is_active (pad)) {
-      ret = gst_pad_activate_push (filter->srcpad, TRUE);
-      ret = ret && gst_pad_activate_push (pad, TRUE);
+    GstActivateMode mode;
+
+    /* in gst_base_metadata_pull_range_parse() we could have triggered
+     * negotiation and plugged new downstream elements.
+     * If GST_PAD_ACTIVATE_MODE (filter->srcpad) is GST_ACTIVATE_PULL it means
+     * that downstream is active in pull mode so we don't deactivate pull mode.
+     */
+    GST_OBJECT_LOCK (filter->srcpad);
+    mode = GST_PAD_ACTIVATE_MODE (filter->srcpad);
+    GST_OBJECT_UNLOCK (filter->srcpad);
+
+    if (mode != GST_ACTIVATE_PULL) {
+      /* change from PULL to PUSH */
+      gst_pad_activate_push (pad, TRUE);
     }
   }
 
   return ret;
-
 }
 
 static gboolean