mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

nlecomposition: Respect seek seqnum in output EOS/SEGMENT

Browse source 
Allowing a proper seek EOS handling with nested compositions
This commit is contained in:
Thibault Saunier 2019-06-06 12:46:08 -04:00
parent 93289ac406
commit d07fe11c5f
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/nle/nlecomposition.c
View file

@ -199,6 +199,8 @@ struct _NleCompositionPrivate
gboolean suppress_child_error;
NleUpdateStackReason updating_reason;
guint seek_seqnum;
};
#define ACTION_CALLBACK(__action) (((GCClosure*) (__action))->callback)
@ -582,6 +584,7 @@ _seek_pipeline_func (NleComposition * comp, SeekData * seekd)
priv->next_base_time = 0;
comp->priv->seek_seqnum = gst_event_get_seqnum (seekd->event);
seek_handling (seekd->comp, gst_event_get_seqnum (seekd->event),
COMP_UPDATE_STACK_ON_SEEK);
@ -903,6 +906,7 @@ _add_seek_action (NleComposition * comp, GstEvent * event)
comp->priv->next_eos_seqnum = 0;
comp->priv->real_eos_seqnum = 0;
comp->priv->seek_seqnum = 0;
_add_action_locked (comp, G_CALLBACK (_seek_pipeline_func), seekd,
G_PRIORITY_DEFAULT);
@ -1207,6 +1211,7 @@ nle_composition_reset (NleComposition * comp)
priv->initialized = FALSE;
priv->send_stream_start = TRUE;
priv->real_eos_seqnum = 0;
priv->seek_seqnum = 0;
priv->next_eos_seqnum = 0;
priv->flush_seqnum = 0;
@ -1302,7 +1307,10 @@ ghost_event_probe_handler (GstPad * ghostpad G_GNUC_UNUSED,
comp->priv->next_base_time += rstop - rstart;
event2 = gst_event_new_segment (&copy);
GST_EVENT_SEQNUM (event2) = GST_EVENT_SEQNUM (event);
if (comp->priv->seek_seqnum)
GST_EVENT_SEQNUM (event2) = comp->priv->seek_seqnum;
else
GST_EVENT_SEQNUM (event2) = GST_EVENT_SEQNUM (event);
GST_PAD_PROBE_INFO_DATA (info) = event2;
gst_event_unref (event);
@ -1332,6 +1340,9 @@ ghost_event_probe_handler (GstPad * ghostpad G_GNUC_UNUSED,
GST_INFO_OBJECT (comp, "Got EOS for real, seq ID is %i, fowarding it",
seqnum);
if (comp->priv->seek_seqnum)
GST_EVENT_SEQNUM (event) = comp->priv->seek_seqnum;
return GST_PAD_PROBE_OK;
}