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

mpegdemux: don't add a base_time==-1 to segment positions

Browse source 
Fixes assertion about newsegment with start=-1.
This commit is contained in:
Stefan Kost 2009-07-22 00:33:22 +03:00
parent 43657ef1f3
commit 5e6edd7e7b
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/mpegdemux/gstmpegdemux.c
View file

@ -845,6 +845,7 @@ gst_flups_demux_close_segment (GstFluPSDemux * demux)
{ {
gint id; gint id;
GstEvent *event = NULL; GstEvent *event = NULL;
guint64 base_time;
#if POST_10_10 #if POST_10_10
GST_INFO_OBJECT (demux, "closing running segment %" GST_SEGMENT_FORMAT, GST_INFO_OBJECT (demux, "closing running segment %" GST_SEGMENT_FORMAT,
@ -855,14 +856,17 @@ gst_flups_demux_close_segment (GstFluPSDemux * demux)
* last_seg_start != clock_time_none, as that indicates a sparse-stream * last_seg_start != clock_time_none, as that indicates a sparse-stream
* event was sent there */ * event was sent there */
if ((base_time = demux->base_time) == (guint64) - 1)
base_time = 0;
/* Close the current segment for a linear playback */ /* Close the current segment for a linear playback */
if (demux->src_segment.rate >= 0) { if (demux->src_segment.rate >= 0) {
/* for forward playback, we played from start to last_stop */ /* for forward playback, we played from start to last_stop */
event = gst_event_new_new_segment (TRUE, event = gst_event_new_new_segment (TRUE,
demux->src_segment.rate, demux->src_segment.format, demux->src_segment.rate, demux->src_segment.format,
demux->src_segment.start + demux->base_time, demux->src_segment.start + base_time,
demux->src_segment.last_stop + demux->base_time, demux->src_segment.last_stop + base_time, demux->src_segment.time);
demux->src_segment.time);
} else { } else {
gint64 stop; gint64 stop;
@ -872,8 +876,8 @@ gst_flups_demux_close_segment (GstFluPSDemux * demux)
/* for reverse playback, we played from stop to last_stop. */ /* for reverse playback, we played from stop to last_stop. */
event = gst_event_new_new_segment (TRUE, event = gst_event_new_new_segment (TRUE,
demux->src_segment.rate, demux->src_segment.format, demux->src_segment.rate, demux->src_segment.format,
demux->src_segment.last_stop + demux->base_time, demux->src_segment.last_stop + base_time,
stop + demux->base_time, demux->src_segment.last_stop); stop + base_time, demux->src_segment.last_stop);
} }
if (event) { if (event) {