diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2005-05-25 12:58:23 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2005-05-25 12:58:23 +0000 |
| commit | a5d8b514c5895a5b72336545ce0b0dacd460ad9e (patch) | |
| tree | 2e3c287111932883fa349c9c7bd9ab96a6ca5aa2 /gst/goom/gstgoom.c | |
| parent | d9568ba3550f9415482d3226b65f48ebd8bffb08 (diff) | |
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.
Diffstat (limited to 'gst/goom/gstgoom.c')
| -rw-r--r-- | gst/goom/gstgoom.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index d9c0db42..cf5b86f1 100644 --- 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; } } |