mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstpad.c: Must set peer pads before calling the link function, otherwise a task started from a link function migh...

Browse source 
Original commit message from CVS:
* gst/gstpad.c: (gst_pad_link):
Must set peer pads before calling the link function, otherwise
a task started from a link function might get a flow-not-linked
result when trying to push because the other thread where the
linking happens hasn't had a chance to set the peers yet. This
might happen for example when a queue gets linked to a downstream
element, as queue starts a streaming task when its source pad
gets linked. Happens in real life when playing back flac/musepack
files in playbin (#332390).
This commit is contained in:
Tim-Philipp Müller 2006-04-08 18:11:56 +00:00
parent 7e2286d79c
commit ed95eff8a1
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2006-04-08 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstpad.c: (gst_pad_link):
Must set peer pads before calling the link function, otherwise
a task started from a link function might get a flow-not-linked
result when trying to push because the other thread where the
linking happens hasn't had a chance to set the peers yet. This
might happen for example when a queue gets linked to a downstream
element, as queue starts a streaming task when its source pad
gets linked. Happens in real life when playing back flac/musepack
files in playbin (#332390).
2006-04-08 Stefan Kost <ensonic@users.sf.net> 2006-04-08 Stefan Kost <ensonic@users.sf.net>
* gst/gstindex.h: * gst/gstindex.h:

10
gst/gstpad.c
View file

@ -1730,6 +1730,10 @@ gst_pad_link (GstPad * srcpad, GstPad * sinkpad)
if (result != GST_PAD_LINK_OK) if (result != GST_PAD_LINK_OK)
goto prepare_failed; goto prepare_failed;
/* must set peers before calling the link function */
GST_PAD_PEER (srcpad) = sinkpad;
GST_PAD_PEER (sinkpad) = srcpad;
GST_OBJECT_UNLOCK (sinkpad); GST_OBJECT_UNLOCK (sinkpad);
GST_OBJECT_UNLOCK (srcpad); GST_OBJECT_UNLOCK (srcpad);
@ -1750,9 +1754,6 @@ gst_pad_link (GstPad * srcpad, GstPad * sinkpad)
GST_OBJECT_LOCK (sinkpad); GST_OBJECT_LOCK (sinkpad);
if (result == GST_PAD_LINK_OK) { if (result == GST_PAD_LINK_OK) {
GST_PAD_PEER (srcpad) = sinkpad;
GST_PAD_PEER (sinkpad) = srcpad;
GST_OBJECT_UNLOCK (sinkpad); GST_OBJECT_UNLOCK (sinkpad);
GST_OBJECT_UNLOCK (srcpad); GST_OBJECT_UNLOCK (srcpad);
@ -1767,6 +1768,9 @@ gst_pad_link (GstPad * srcpad, GstPad * sinkpad)
GST_CAT_INFO (GST_CAT_PADS, "link between %s:%s and %s:%s failed", GST_CAT_INFO (GST_CAT_PADS, "link between %s:%s and %s:%s failed",
GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad)); GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
GST_PAD_PEER (srcpad) = NULL;
GST_PAD_PEER (sinkpad) = NULL;
GST_OBJECT_UNLOCK (sinkpad); GST_OBJECT_UNLOCK (sinkpad);
GST_OBJECT_UNLOCK (srcpad); GST_OBJECT_UNLOCK (srcpad);
} }