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

a couple of fixes here:

Browse source 
Original commit message from CVS:
a couple of fixes here:
- forward eos events to all src pads, even if spider didn't connect them. this ensures that the pipeline will stay in a consistant state even when not all pads are sent data
- don't check for nonnull spider until it is actually needed.  it really is null when it has been disposed and this method is called.
This commit is contained in:
Steve Baker 2002-06-07 19:41:35 +00:00
parent a02e75b8d4
commit 7ae62fa9bf
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/autoplug/gstspideridentity.c
View file

@ -185,7 +185,7 @@ gst_spider_identity_chain (GstPad *pad, GstBuffer *buf)
{
GstSpiderConnection *conn = (GstSpiderConnection *) list->data;
list = g_list_next (list);
if (conn->sink == ident && (GstElement *) conn->src != conn->current)
if (conn->sink == ident)
{
gst_element_set_eos (GST_ELEMENT (conn->src));
gst_pad_push (conn->src->src, GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
@ -317,16 +317,16 @@ gst_spider_identity_change_state (GstElement *element)
/* element check */
ident = GST_SPIDER_IDENTITY (element);
g_return_val_if_fail (ident != NULL, GST_PAD_CONNECT_REFUSED);
g_return_val_if_fail (GST_IS_SPIDER_IDENTITY (ident), GST_PAD_CONNECT_REFUSED);
/* autoplugger check */
spider = GST_SPIDER (GST_ELEMENT_PARENT (ident));
g_return_val_if_fail (spider != NULL, GST_PAD_CONNECT_REFUSED);
g_return_val_if_fail (GST_IS_SPIDER (spider), GST_PAD_CONNECT_REFUSED);
g_return_val_if_fail (ident != NULL, GST_STATE_FAILURE);
g_return_val_if_fail (GST_IS_SPIDER_IDENTITY (ident), GST_STATE_FAILURE);
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_PAUSED_TO_PLAYING:
/* autoplugger check */
spider = GST_SPIDER (GST_ELEMENT_PARENT (ident));
g_return_val_if_fail (spider != NULL, GST_STATE_FAILURE);
g_return_val_if_fail (GST_IS_SPIDER (spider), GST_STATE_FAILURE);
/* start typefinding or plugging */
if ((GST_RPAD_PEER (ident->sink) != NULL) && (GST_RPAD_PEER (ident->src) == NULL))
{