mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

adder: Make sure FLUSH_STOP is always sent after a flushing seek.

Browse source 
Send FLUSH_STOP right after forwarding the seek event upstream if necessary.
This makes sure that adder->srcpad is not left flushing if seeking fails or if
upstream is blocked.

The same fix was already applied to videomixer in 49b2a946.
This commit is contained in:
Alessandro Decina 2010-08-24 11:39:09 +02:00
parent 5e0706c74f
commit 842a6c64c5
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/adder/gstadder.c
View file

@ -685,6 +685,14 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
/* flushing seek, start flush downstream, the flush will be done /* flushing seek, start flush downstream, the flush will be done
* when all pads received a FLUSH_STOP. */ * when all pads received a FLUSH_STOP. */
gst_pad_push_event (adder->srcpad, gst_event_new_flush_start ()); gst_pad_push_event (adder->srcpad, gst_event_new_flush_start ());
/* We can't send FLUSH_STOP here since upstream could start pushing data
* after we unlock adder->collect.
* We set flush_stop_pending to TRUE instead and send FLUSH_STOP after
* forwarding the seek upstream or from gst_adder_collected,
* whichever happens first.
*/
adder->flush_stop_pending = TRUE;
} }
GST_DEBUG_OBJECT (adder, "handling seek event: %" GST_PTR_FORMAT, event); GST_DEBUG_OBJECT (adder, "handling seek event: %" GST_PTR_FORMAT, event);
@ -708,10 +716,6 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
* have stopped so that the cookie gets properly updated. */ * have stopped so that the cookie gets properly updated. */
gst_collect_pads_set_flushing (adder->collect, TRUE); gst_collect_pads_set_flushing (adder->collect, TRUE);
} }
/* we might have a pending flush_stop event now. This event will either be
* sent by an upstream element when it completes the seek or we will push
* one in the collected callback ourself */
adder->flush_stop_pending = flush;
GST_OBJECT_UNLOCK (adder->collect); GST_OBJECT_UNLOCK (adder->collect);
GST_DEBUG_OBJECT (adder, "forwarding seek event: %" GST_PTR_FORMAT, GST_DEBUG_OBJECT (adder, "forwarding seek event: %" GST_PTR_FORMAT,
event); event);
@ -721,10 +725,11 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
/* seek failed. maybe source is a live source. */ /* seek failed. maybe source is a live source. */
GST_DEBUG_OBJECT (adder, "seeking failed"); GST_DEBUG_OBJECT (adder, "seeking failed");
} }
/* FIXME: ideally we would like to send a flush-stop event from here but if (g_atomic_int_compare_and_exchange (&adder->flush_stop_pending,
* collectpads does not have a method that allows us to do that. Instead TRUE, FALSE)) {
* we forward all flush-stop events we receive on the sinkpads. We might GST_DEBUG_OBJECT (adder, "pending flush stop");
* be sending too many flush-stop events. */ gst_pad_push_event (adder->srcpad, gst_event_new_flush_stop ());
}
break; break;
} }
case GST_EVENT_QOS: case GST_EVENT_QOS:
@ -1055,9 +1060,10 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
if (G_UNLIKELY (adder->func == NULL)) if (G_UNLIKELY (adder->func == NULL))
goto not_negotiated; goto not_negotiated;
if (adder->flush_stop_pending) { if (g_atomic_int_compare_and_exchange (&adder->flush_stop_pending,
TRUE, FALSE)) {
GST_DEBUG_OBJECT (adder, "pending flush stop");
gst_pad_push_event (adder->srcpad, gst_event_new_flush_stop ()); gst_pad_push_event (adder->srcpad, gst_event_new_flush_stop ());
adder->flush_stop_pending = FALSE;
} }
/* get available bytes for reading, this can be 0 which could mean empty /* get available bytes for reading, this can be 0 which could mean empty