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

pad: resend dropped events

Browse source 
If we try to push sticky events but a probe dropped them, we don't mark
the event as received and mark the pad as PENDING_EVENTS. This ensures
that we resend the event the next time. For this we need to let the
custom flow return from the probe trickle up to
gst_pad_push_event_unchecked() so that we can differentiate between
OK and DROPPED probe returns.
This commit is contained in:
Wim Taymans 2012-10-05 09:42:59 +02:00
parent 0ae3492f6b
commit d630a115f9
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/gstpad.c
View file

@ -3291,15 +3291,24 @@ push_sticky (GstPad * pad, PadEvent * ev, gpointer user_data)
GST_DEBUG_OBJECT (pad, "event %s marked received", GST_DEBUG_OBJECT (pad, "event %s marked received",
GST_EVENT_TYPE_NAME (event)); GST_EVENT_TYPE_NAME (event));
break; break;
case GST_FLOW_CUSTOM_SUCCESS:
/* we can't assume the event is received when it was dropped */
GST_DEBUG_OBJECT (pad, "event %s was dropped, mark pending",
GST_EVENT_TYPE_NAME (event));
GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PENDING_EVENTS);
data->ret = GST_FLOW_OK;
break;
case GST_FLOW_NOT_LINKED: case GST_FLOW_NOT_LINKED:
/* not linked is not a problem, we are sticky so the event will be /* not linked is not a problem, we are sticky so the event will be
* sent later but only for non-EOS events */ * sent later but only for non-EOS events */
GST_DEBUG_OBJECT (pad, "pad was not linked"); GST_DEBUG_OBJECT (pad, "pad was not linked, mark pending");
if (GST_EVENT_TYPE (event) != GST_EVENT_EOS) if (GST_EVENT_TYPE (event) != GST_EVENT_EOS)
data->ret = GST_FLOW_OK; data->ret = GST_FLOW_OK;
/* fallthrough */ GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PENDING_EVENTS);
break;
default: default:
GST_DEBUG_OBJECT (pad, "mark pending events"); GST_DEBUG_OBJECT (pad, "result %s, mark pending events",
gst_flow_get_name (data->ret));
GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PENDING_EVENTS); GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PENDING_EVENTS);
break; break;
} }
@ -3336,6 +3345,10 @@ check_sticky (GstPad * pad)
if (ev && !ev->received) { if (ev && !ev->received) {
data.ret = gst_pad_push_event_unchecked (pad, gst_event_ref (ev->event), data.ret = gst_pad_push_event_unchecked (pad, gst_event_ref (ev->event),
GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM); GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM);
/* the event could have been dropped. Because this can only
* happen if the user asked for it, it's not an error */
if (data.ret == GST_FLOW_CUSTOM_SUCCESS)
data.ret = GST_FLOW_OK;
} }
} }
} }
@ -4531,7 +4544,6 @@ probe_stopped:
switch (ret) { switch (ret) {
case GST_FLOW_CUSTOM_SUCCESS: case GST_FLOW_CUSTOM_SUCCESS:
GST_DEBUG_OBJECT (pad, "dropped event"); GST_DEBUG_OBJECT (pad, "dropped event");
ret = GST_FLOW_OK;
break; break;
default: default:
GST_DEBUG_OBJECT (pad, "an error occured %s", gst_flow_get_name (ret)); GST_DEBUG_OBJECT (pad, "an error occured %s", gst_flow_get_name (ret));
@ -4623,8 +4635,12 @@ gst_pad_push_event (GstPad * pad, GstEvent * event)
res = (check_sticky (pad) == GST_FLOW_OK); res = (check_sticky (pad) == GST_FLOW_OK);
} }
if (!sticky) { if (!sticky) {
GstFlowReturn ret;
/* other events are pushed right away */ /* other events are pushed right away */
res = (gst_pad_push_event_unchecked (pad, event, type) == GST_FLOW_OK); ret = gst_pad_push_event_unchecked (pad, event, type);
/* dropped events by a probe are not an error */
res = (ret == GST_FLOW_OK || ret == GST_FLOW_CUSTOM_SUCCESS);
} else { } else {
/* Errors in sticky event pushing are no problem and ignored here /* Errors in sticky event pushing are no problem and ignored here
* as they will cause more meaningful errors during data flow. * as they will cause more meaningful errors during data flow.