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

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

Browse source 
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.
This commit is contained in:
Wim Taymans 2005-05-25 12:58:23 +00:00
parent d9568ba355
commit a5d8b514c5
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
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),

8
gst/alpha/gstalpha.c
View file

@ -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;
}

10
gst/goom/gstgoom.c
View file

@ -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;
}
}