mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad: Update pad offsets on the current event if the offset changed in pad probes

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=796898
This commit is contained in:
Sebastian Dröge 2018-07-31 16:46:25 +03:00
parent c3d3cf074e
commit babd0e5f5d
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gst/gstpad.c
View file

@ -644,12 +644,13 @@ restart:
/* should be called with LOCK */ /* should be called with LOCK */
static GstEvent * static GstEvent *
_apply_pad_offset (GstPad * pad, GstEvent * event, gboolean upstream) _apply_pad_offset (GstPad * pad, GstEvent * event, gboolean upstream,
gint64 pad_offset)
{ {
gint64 offset; gint64 offset;
GST_DEBUG_OBJECT (pad, "apply pad offset %" GST_STIME_FORMAT, GST_DEBUG_OBJECT (pad, "apply pad offset %" GST_STIME_FORMAT,
GST_STIME_ARGS (pad->offset)); GST_STIME_ARGS (pad_offset));
if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) { if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
GstSegment segment; GstSegment segment;
@ -660,16 +661,16 @@ _apply_pad_offset (GstPad * pad, GstEvent * event, gboolean upstream)
gst_event_copy_segment (event, &segment); gst_event_copy_segment (event, &segment);
gst_event_unref (event); gst_event_unref (event);
gst_segment_offset_running_time (&segment, segment.format, pad->offset); gst_segment_offset_running_time (&segment, segment.format, pad_offset);
event = gst_event_new_segment (&segment); event = gst_event_new_segment (&segment);
} }
event = gst_event_make_writable (event); event = gst_event_make_writable (event);
offset = gst_event_get_running_time_offset (event); offset = gst_event_get_running_time_offset (event);
if (upstream) if (upstream)
offset -= pad->offset; offset -= pad_offset;
else else
offset += pad->offset; offset += pad_offset;
gst_event_set_running_time_offset (event, offset); gst_event_set_running_time_offset (event, offset);
return event; return event;
@ -679,11 +680,10 @@ static inline GstEvent *
apply_pad_offset (GstPad * pad, GstEvent * event, gboolean upstream) apply_pad_offset (GstPad * pad, GstEvent * event, gboolean upstream)
{ {
if (G_UNLIKELY (pad->offset != 0)) if (G_UNLIKELY (pad->offset != 0))
return _apply_pad_offset (pad, event, upstream); return _apply_pad_offset (pad, event, upstream, pad->offset);
return event; return event;
} }
/* should be called with the OBJECT_LOCK */ /* should be called with the OBJECT_LOCK */
static GstCaps * static GstCaps *
get_pad_caps (GstPad * pad) get_pad_caps (GstPad * pad)
@ -5299,6 +5299,7 @@ gst_pad_push_event_unchecked (GstPad * pad, GstEvent * event,
GstFlowReturn ret; GstFlowReturn ret;
GstPad *peerpad; GstPad *peerpad;
GstEventType event_type; GstEventType event_type;
gint64 old_pad_offset = pad->offset;
/* pass the adjusted event on. We need to do this even if /* pass the adjusted event on. We need to do this even if
* there is no peer pad because of the probes. */ * there is no peer pad because of the probes. */
@ -5381,6 +5382,15 @@ gst_pad_push_event_unchecked (GstPad * pad, GstEvent * event,
events_foreach (pad, sticky_changed, &data); events_foreach (pad, sticky_changed, &data);
} }
/* the pad offset might've been changed by any of the probes above. It
* would've been taken into account when repushing any of the sticky events
* above but not for our current event here */
if (G_UNLIKELY (old_pad_offset != pad->offset)) {
event =
_apply_pad_offset (pad, event, GST_PAD_IS_SINK (pad),
pad->offset - old_pad_offset);
}
/* now check the peer pad */ /* now check the peer pad */
peerpad = GST_PAD_PEER (pad); peerpad = GST_PAD_PEER (pad);
if (peerpad == NULL) if (peerpad == NULL)
@ -5622,9 +5632,11 @@ gst_pad_send_event_unchecked (GstPad * pad, GstEvent * event,
GstPadEventFunction eventfunc; GstPadEventFunction eventfunc;
GstPadEventFullFunction eventfullfunc = NULL; GstPadEventFullFunction eventfullfunc = NULL;
GstObject *parent; GstObject *parent;
gint64 old_pad_offset;
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
old_pad_offset = pad->offset;
event = apply_pad_offset (pad, event, GST_PAD_IS_SRC (pad)); event = apply_pad_offset (pad, event, GST_PAD_IS_SRC (pad));
if (GST_PAD_IS_SINK (pad)) if (GST_PAD_IS_SINK (pad))
@ -5720,6 +5732,15 @@ gst_pad_send_event_unchecked (GstPad * pad, GstEvent * event,
PROBE_PUSH (pad, type | GST_PAD_PROBE_TYPE_PUSH, event, probe_stopped); PROBE_PUSH (pad, type | GST_PAD_PROBE_TYPE_PUSH, event, probe_stopped);
/* the pad offset might've been changed by any of the probes above. It
* would've been taken into account when repushing any of the sticky events
* above but not for our current event here */
if (G_UNLIKELY (old_pad_offset != pad->offset)) {
event =
_apply_pad_offset (pad, event, GST_PAD_IS_SRC (pad),
pad->offset - old_pad_offset);
}
eventfullfunc = GST_PAD_EVENTFULLFUNC (pad); eventfullfunc = GST_PAD_EVENTFULLFUNC (pad);
eventfunc = GST_PAD_EVENTFUNC (pad); eventfunc = GST_PAD_EVENTFUNC (pad);
if (G_UNLIKELY (eventfunc == NULL && eventfullfunc == NULL)) if (G_UNLIKELY (eventfunc == NULL && eventfullfunc == NULL))