FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gst/playback/gstplaybin.c: Invert bin_add/link order to workaround deadlock in opt.

Browse Source 
Original commit message from CVS:
* gst/playback/gstplaybin.c: (add_sink):
Invert bin_add/link order to workaround deadlock in opt.
This commit is contained in:
Ronald S. Bultje 2005-02-16 13:33:12 +00:00
parent 44addff581
commit 232ea470f6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/playback/gstplaybin.c: (add_sink):
Invert bin_add/link order to workaround deadlock in opt.
2005-02-15 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-02-15 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/modplug/gstmodplug.cc: * gst/modplug/gstmodplug.cc:

8
gst/playback/gstplaybin.c
View File

@ -692,14 +692,13 @@ add_sink (GstPlayBin * play_bin, GstElement * sink, GstPad * srcpad)
gboolean res; gboolean res;
/* we found a sink for this stream, now try to install it */ /* we found a sink for this stream, now try to install it */
gst_bin_add (GST_BIN (play_bin), sink); sinkpad = gst_element_get_pad (sink, "sink");
res = gst_pad_link (srcpad, sinkpad);
GST_DEBUG ("Adding sink with state %d (parent: %d, peer: %d)\n", GST_DEBUG ("Adding sink with state %d (parent: %d, peer: %d)\n",
GST_STATE (sink), GST_STATE (play_bin), GST_STATE (sink), GST_STATE (play_bin),
GST_STATE (gst_pad_get_parent (srcpad))); GST_STATE (gst_pad_get_parent (srcpad)));
sinkpad = gst_element_get_pad (sink, "sink");
/* try to link the pad of the sink to the stream */ /* try to link the pad of the sink to the stream */
res = gst_pad_link (srcpad, sinkpad);
if (!res) { if (!res) {
gchar *capsstr; gchar *capsstr;
@ -707,12 +706,11 @@ add_sink (GstPlayBin * play_bin, GstElement * sink, GstPad * srcpad)
capsstr = gst_caps_to_string (gst_pad_get_caps (srcpad)); capsstr = gst_caps_to_string (gst_pad_get_caps (srcpad));
g_warning ("could not link %s", capsstr); g_warning ("could not link %s", capsstr);
g_free (capsstr); g_free (capsstr);
GST_LOG ("removing sink %p", sink);
gst_bin_remove (GST_BIN (play_bin), sink);
} else { } else {
/* we got the sink succesfully linked, now keep the sink /* we got the sink succesfully linked, now keep the sink
* in out internal list */ * in out internal list */
play_bin->sinks = g_list_prepend (play_bin->sinks, sink); play_bin->sinks = g_list_prepend (play_bin->sinks, sink);
gst_bin_add (GST_BIN (play_bin), sink);
} }
return res; return res;