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

gstpad: Fix non-serialized sticky event push

Browse source 
With non-serialized sticky events, such as GST_EVENT_INSTANT_RATE, we both want
to store the event (for later re-linking) *AND* push the event in a non-blocking
way.

We therefore must *not* propagate pending sticky events if the event is "sticky
or serialized" but only if it's "serialized"

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3254>
This commit is contained in:
Edward Hervey 2022-10-24 12:13:14 +02:00 committed by GStreamer Marge Bot
parent 424b331afc
commit 730ed3a69a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
subprojects/gstreamer/gst/gstpad.c
View file

@ -5507,8 +5507,7 @@ gst_pad_push_event_unchecked (GstPad * pad, GstEvent * event,
GST_PAD_PROBE_TYPE_BLOCK, event, probe_stopped); GST_PAD_PROBE_TYPE_BLOCK, event, probe_stopped);
/* recheck sticky events because the probe might have cause a relink */ /* recheck sticky events because the probe might have cause a relink */
if (GST_PAD_HAS_PENDING_EVENTS (pad) && GST_PAD_IS_SRC (pad) if (GST_PAD_HAS_PENDING_EVENTS (pad) && GST_PAD_IS_SRC (pad)
&& (GST_EVENT_IS_SERIALIZED (event) && (GST_EVENT_IS_SERIALIZED (event))) {
|| GST_EVENT_IS_STICKY (event))) {
PushStickyData data = { GST_FLOW_OK, FALSE, event }; PushStickyData data = { GST_FLOW_OK, FALSE, event };
GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PENDING_EVENTS); GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PENDING_EVENTS);
@ -5525,8 +5524,7 @@ gst_pad_push_event_unchecked (GstPad * pad, GstEvent * event,
/* recheck sticky events because the probe might have cause a relink */ /* recheck sticky events because the probe might have cause a relink */
if (GST_PAD_HAS_PENDING_EVENTS (pad) && GST_PAD_IS_SRC (pad) if (GST_PAD_HAS_PENDING_EVENTS (pad) && GST_PAD_IS_SRC (pad)
&& (GST_EVENT_IS_SERIALIZED (event) && (GST_EVENT_IS_SERIALIZED (event))) {
|| GST_EVENT_IS_STICKY (event))) {
PushStickyData data = { GST_FLOW_OK, FALSE, event }; PushStickyData data = { GST_FLOW_OK, FALSE, event };
GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PENDING_EVENTS); GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PENDING_EVENTS);
@ -5684,15 +5682,17 @@ gst_pad_push_event (GstPad * pad, GstEvent * event)
break; break;
} }
} }
if (GST_PAD_IS_SRC (pad) && (serialized || sticky)) { if (GST_PAD_IS_SRC (pad) && serialized) {
/* all serialized or sticky events on the srcpad trigger push of /* All serialized events on the srcpad trigger push of sticky events.
* sticky events */ *
* Note that we do not do this for non-serialized sticky events since it
* could potentially block. */
res = (check_sticky (pad, event) == GST_FLOW_OK); res = (check_sticky (pad, event) == GST_FLOW_OK);
} }
if (!sticky) { if (!serialized || !sticky) {
GstFlowReturn ret; GstFlowReturn ret;
/* other events are pushed right away */ /* non-serialized and non-sticky events are pushed right away. */
ret = gst_pad_push_event_unchecked (pad, event, type); ret = gst_pad_push_event_unchecked (pad, event, type);
/* dropped events by a probe are not an error */ /* dropped events by a probe are not an error */
res = (ret == GST_FLOW_OK || ret == GST_FLOW_CUSTOM_SUCCESS res = (ret == GST_FLOW_OK || ret == GST_FLOW_CUSTOM_SUCCESS