mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 12:15:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

collectpads: When seek flushed, immediately set eospads to 0

Browse source 
This prevents situations where a first branch would get seeked and
receive a buffer before all branches got seeked, and thus collected
would get called based on EOS from the previous segment.

As a consequence, during the process of seeking, don't decrease
the eospads number when a FLUSH_STOP is received.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=724571
This commit is contained in:
Mathieu Duponchelle 2014-02-19 02:27:36 +01:00 committed by Sebastian Dröge
parent 595481c759
commit d784d59262
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/gst/base/gstcollectpads.c
View file

@ -1734,7 +1734,9 @@ gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data,
if (!GST_COLLECT_PADS_STATE_IS_SET (data, if (!GST_COLLECT_PADS_STATE_IS_SET (data,
GST_COLLECT_PADS_STATE_WAITING)) GST_COLLECT_PADS_STATE_WAITING))
pads->priv->queuedpads++; pads->priv->queuedpads++;
pads->priv->eospads--; if (!g_atomic_int_get (&pads->priv->seeking)) {
pads->priv->eospads--;
}
GST_COLLECT_PADS_STATE_UNSET (data, GST_COLLECT_PADS_STATE_EOS); GST_COLLECT_PADS_STATE_UNSET (data, GST_COLLECT_PADS_STATE_EOS);
} }
GST_COLLECT_PADS_STREAM_UNLOCK (pads); GST_COLLECT_PADS_STREAM_UNLOCK (pads);
@ -1912,6 +1914,8 @@ gst_collect_pads_src_event_default (GstCollectPads * pads, GstPad * pad,
case GST_EVENT_SEEK:{ case GST_EVENT_SEEK:{
GstSeekFlags flags; GstSeekFlags flags;
pads->priv->eospads = 0;
GST_INFO_OBJECT (pads, "starting seek"); GST_INFO_OBJECT (pads, "starting seek");
gst_event_parse_seek (event, NULL, NULL, &flags, NULL, NULL, NULL, NULL); gst_event_parse_seek (event, NULL, NULL, &flags, NULL, NULL, NULL, NULL);