No need to take the lock anymore, core already did that before calling us.

Original commit message from CVS:
* ext/mad/gstmad.c: (gst_mad_chain), (gst_mad_change_state):
* ext/sidplay/gstsiddec.cc:
* gst/alpha/gstalpha.c: (gst_alpha_chain):
* gst/goom/gstgoom.c: (gst_goom_chain):
No need to take the lock anymore,  core already did
that before calling us.

diff --git a/ChangeLog b/ChangeLog
index da2ba92..54c2d90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2005-05-25  Wim Taymans  <wim@fluendo.com>
 
+       * ext/mad/gstmad.c: (gst_mad_chain), (gst_mad_change_state):
+       * ext/sidplay/gstsiddec.cc:
+       * gst/alpha/gstalpha.c: (gst_alpha_chain):
+       * gst/goom/gstgoom.c: (gst_goom_chain):
+       No need to take the lock anymore,  core already did
+       that before calling us.
+
+2005-05-25  Wim Taymans  <wim@fluendo.com>
+
        * ext/amrnb/amrnbdec.c: (gst_amrnbdec_init), (gst_amrnbdec_chain),
        (gst_amrnbdec_state_change):
        * ext/amrnb/amrnbenc.c: (gst_amrnbenc_base_init),

diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c
index b052d5b..a7573a5 100644 (file)
--- a/gst/alpha/gstalpha.c
+++ b/gst/alpha/gstalpha.c
@@ -798,13 +798,11 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer)
 
   alpha = GST_ALPHA (GST_PAD_PARENT (pad));
 
-  GST_STREAM_LOCK (pad);
-
   new_width = alpha->in_width;
   new_height = alpha->in_height;
 
   if (new_width != alpha->out_width ||
-      new_height != alpha->out_height || !GST_RPAD_CAPS (alpha->srcpad)) {
+      new_height != alpha->out_height || !GST_PAD_CAPS (alpha->srcpad)) {
     GstCaps *newcaps;
 
     newcaps = gst_caps_copy (gst_pad_get_negotiated_caps (alpha->sinkpad));
@@ -821,7 +819,7 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer)
   outbuf =
       gst_buffer_new_and_alloc (ROUND_UP_2 (new_width) *
       ROUND_UP_2 (new_height) * 4);
-  gst_buffer_set_caps (outbuf, GST_RPAD_CAPS (alpha->srcpad));
+  gst_buffer_set_caps (outbuf, GST_PAD_CAPS (alpha->srcpad));
   GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buffer);
   GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buffer);
 
@@ -854,8 +852,6 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer)
 
   ret = gst_pad_push (alpha->srcpad, outbuf);
 
-  GST_STREAM_UNLOCK (pad);
-
   return ret;
 }
 

diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index d9c0db4..cf5b86f 100644 (file)
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -341,8 +341,6 @@ gst_goom_chain (GstPad * pad, GstBuffer * bufin)
 
   goom = GST_GOOM (GST_PAD_PARENT (pad));
 
-  GST_STREAM_LOCK (pad);
-
   if (goom->channels == 0)
     goto not_negotiated;
 
@@ -364,7 +362,7 @@ gst_goom_chain (GstPad * pad, GstBuffer * bufin)
 
   ret = GST_FLOW_OK;
 
-  if (GST_RPAD_CAPS (goom->srcpad) == NULL) {
+  if (GST_PAD_CAPS (goom->srcpad) == NULL) {
     if (!gst_goom_src_negotiate (goom))
       goto no_format;
   }
@@ -394,7 +392,7 @@ gst_goom_chain (GstPad * pad, GstBuffer * bufin)
     }
 
     bufout = gst_pad_alloc_buffer (goom->srcpad, GST_BUFFER_OFFSET_NONE,
-        goom->width * goom->height * 4, GST_RPAD_CAPS (goom->srcpad));
+        goom->width * goom->height * 4, GST_PAD_CAPS (goom->srcpad));
     GST_BUFFER_TIMESTAMP (bufout) =
         goom->audio_basetime +
         (GST_SECOND * goom->samples_consumed / goom->sample_rate);
@@ -416,8 +414,6 @@ gst_goom_chain (GstPad * pad, GstBuffer * bufin)
     if (ret != GST_FLOW_OK)
       break;
   }
-  GST_STREAM_UNLOCK (pad);
-
   return ret;
 
   /* ERRORS */
@@ -426,7 +422,6 @@ not_negotiated:
     GST_ELEMENT_ERROR (goom, CORE, NEGOTIATION, (NULL),
         ("Format wasn't negotiated before chain function"));
     gst_buffer_unref (bufin);
-    GST_STREAM_UNLOCK (pad);
     return GST_FLOW_NOT_NEGOTIATED;
   }
 no_format:
@@ -434,7 +429,6 @@ no_format:
     GST_ELEMENT_ERROR (goom, CORE, NEGOTIATION, (NULL),
         ("Could not negotiate format"));
     gst_buffer_unref (bufin);
-    GST_STREAM_UNLOCK (pad);
     return GST_FLOW_ERROR;
   }
 }