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

streamsynchronizer: Do not advance segment starts beyond stop times

Browse source 
Advance stop times too when they are getting higher than the
stop time of segments, avoiding assertions.

The stop time has to be advanced too so that running time keep in sync
for gapless mode.

https://bugzilla.gnome.org/show_bug.cgi?id=631312
This commit is contained in:
Thiago Santos 2010-10-04 10:01:19 -03:00
parent 8818ea08bd
commit 6d8cb1f42d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/playback/gststreamsynchronizer.c
View file

@ -634,9 +634,13 @@ gst_stream_synchronizer_sink_chain (GstPad * pad, GstBuffer * buffer)
/* Is there a 1 second lag? */ /* Is there a 1 second lag? */
if (last_stop != -1 && last_stop + GST_SECOND < timestamp_end) { if (last_stop != -1 && last_stop + GST_SECOND < timestamp_end) {
gint64 new_start; gint64 new_start, new_stop;
new_start = timestamp_end - GST_SECOND; new_start = timestamp_end - GST_SECOND;
if (ostream->segment.stop == -1)
new_stop = -1;
else
new_stop = MAX (new_start, ostream->segment.stop);
GST_DEBUG_OBJECT (ostream->sinkpad, GST_DEBUG_OBJECT (ostream->sinkpad,
"Advancing stream %u from %" GST_TIME_FORMAT " to %" "Advancing stream %u from %" GST_TIME_FORMAT " to %"
@ -646,11 +650,10 @@ gst_stream_synchronizer_sink_chain (GstPad * pad, GstBuffer * buffer)
gst_pad_push_event (ostream->srcpad, gst_pad_push_event (ostream->srcpad,
gst_event_new_new_segment_full (TRUE, ostream->segment.rate, gst_event_new_new_segment_full (TRUE, ostream->segment.rate,
ostream->segment.applied_rate, ostream->segment.format, ostream->segment.applied_rate, ostream->segment.format,
new_start, ostream->segment.stop, new_start)); new_start, new_stop, new_start));
gst_segment_set_newsegment_full (&ostream->segment, TRUE, gst_segment_set_newsegment_full (&ostream->segment, TRUE,
ostream->segment.rate, ostream->segment.applied_rate, ostream->segment.rate, ostream->segment.applied_rate,
ostream->segment.format, new_start, ostream->segment.stop, ostream->segment.format, new_start, new_stop, new_start);
new_start);
gst_segment_set_last_stop (&ostream->segment, GST_FORMAT_TIME, gst_segment_set_last_stop (&ostream->segment, GST_FORMAT_TIME,
new_start); new_start);
} }