mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

adder: only unflush when we flushed before

Browse source 
Ass suggested by Stefan Kost:
Keep track of when the sinkpad was set to flushing and unflush the pad when an
upstream flushing seek failed.
This commit is contained in:
Wim Taymans 2009-06-23 18:07:31 +02:00
parent 5974042bba
commit 09737d728b
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/adder/gstadder.c
View file

@ -568,21 +568,33 @@ gst_adder_query (GstPad * pad, GstQuery * query)
return res; return res;
} }
static gboolean typedef struct
forward_event_func (GstPad * pad, GValue * ret, GstEvent * event)
{ {
GstEvent *event;
gboolean flush;
} EventData;
static gboolean
forward_event_func (GstPad * pad, GValue * ret, EventData * data)
{
GstEvent *event = data->event;
gst_event_ref (event); gst_event_ref (event);
GST_LOG_OBJECT (pad, "About to send event %s", GST_EVENT_TYPE_NAME (event)); GST_LOG_OBJECT (pad, "About to send event %s", GST_EVENT_TYPE_NAME (event));
if (!gst_pad_push_event (pad, event)) { if (!gst_pad_push_event (pad, event)) {
g_value_set_boolean (ret, FALSE); g_value_set_boolean (ret, FALSE);
GST_WARNING_OBJECT (pad, "Sending event %p (%s) failed.", GST_WARNING_OBJECT (pad, "Sending event %p (%s) failed.",
event, GST_EVENT_TYPE_NAME (event)); event, GST_EVENT_TYPE_NAME (event));
/* quick hack to unflush the pads, ideally we need a way to just unflush
* this single collect pad */
if (data->flush)
gst_pad_send_event (pad, gst_event_new_flush_stop ()); gst_pad_send_event (pad, gst_event_new_flush_stop ());
} else { } else {
GST_LOG_OBJECT (pad, "Sent event %p (%s).", GST_LOG_OBJECT (pad, "Sent event %p (%s).",
event, GST_EVENT_TYPE_NAME (event)); event, GST_EVENT_TYPE_NAME (event));
} }
gst_object_unref (pad); gst_object_unref (pad);
/* continue on other pads, even if one failed */ /* continue on other pads, even if one failed */
return TRUE; return TRUE;
} }
@ -594,24 +606,27 @@ forward_event_func (GstPad * pad, GValue * ret, GstEvent * event)
* sinkpads. * sinkpads.
*/ */
static gboolean static gboolean
forward_event (GstAdder * adder, GstEvent * event) forward_event (GstAdder * adder, GstEvent * event, gboolean flush)
{ {
gboolean ret; gboolean ret;
GstIterator *it; GstIterator *it;
GstIteratorResult ires; GstIteratorResult ires;
GValue vret = { 0 }; GValue vret = { 0 };
EventData data;
GST_LOG_OBJECT (adder, "Forwarding event %p (%s)", event, GST_LOG_OBJECT (adder, "Forwarding event %p (%s)", event,
GST_EVENT_TYPE_NAME (event)); GST_EVENT_TYPE_NAME (event));
ret = TRUE; ret = TRUE;
data.event = event;
data.flush = flush;
g_value_init (&vret, G_TYPE_BOOLEAN); g_value_init (&vret, G_TYPE_BOOLEAN);
g_value_set_boolean (&vret, TRUE); g_value_set_boolean (&vret, TRUE);
it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (adder)); it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (adder));
while (TRUE) { while (TRUE) {
ires = gst_iterator_fold (it, (GstIteratorFoldFunction) forward_event_func, ires = gst_iterator_fold (it, (GstIteratorFoldFunction) forward_event_func,
&vret, event); &vret, &data);
switch (ires) { switch (ires) {
case GST_ITERATOR_RESYNC: case GST_ITERATOR_RESYNC:
GST_WARNING ("resync"); GST_WARNING ("resync");
@ -688,7 +703,7 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
GST_DEBUG_OBJECT (adder, "forwarding seek event: %" GST_PTR_FORMAT, GST_DEBUG_OBJECT (adder, "forwarding seek event: %" GST_PTR_FORMAT,
event); event);
result = forward_event (adder, event); result = forward_event (adder, event, flush);
if (!result) { if (!result) {
/* 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");
@ -711,7 +726,7 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
/* just forward the rest for now */ /* just forward the rest for now */
GST_DEBUG_OBJECT (adder, "forward unhandled event: %s", GST_DEBUG_OBJECT (adder, "forward unhandled event: %s",
GST_EVENT_TYPE_NAME (event)); GST_EVENT_TYPE_NAME (event));
result = forward_event (adder, event); result = forward_event (adder, event, FALSE);
break; break;
} }
gst_object_unref (adder); gst_object_unref (adder);