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

mpegdemux: Handle base_time when sending segment updates.

Browse source 
Don't send bogus new segment update events when the stream doesn't
start at 0. Fixes broken seeking in some files.

Fixes: #594812
This commit is contained in:
Jan Schmidt 2009-09-15 23:32:06 +01:00
parent cb9ff89929
commit 50d08ce732
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gst/mpegdemux/gstmpegdemux.c
View file

@ -763,43 +763,52 @@ gst_flups_demux_clear_times (GstFluPSDemux * demux)
static inline void
gst_flups_demux_send_segment_updates (GstFluPSDemux * demux,
GstClockTime new_time)
GstClockTime new_start)
{
/* Advance all lagging streams by sending a segment update */
GstClockTime base_time, stop, time;
gint i, count = demux->found_count;
GstEvent *event = NULL;
/* FIXME: Handle reverse playback */
/* Advance all lagging streams by sending a segment update */
if ((base_time = demux->base_time) == GST_CLOCK_TIME_NONE)
base_time = 0;
if (new_time > demux->src_segment.stop)
stop = demux->src_segment.stop;
if (stop != GST_CLOCK_TIME_NONE)
stop += base_time;
if (new_start > stop)
return;
time = demux->src_segment.time;
time += new_start - (demux->src_segment.start + base_time);
/* FIXME: Handle reverse playback */
for (i = 0; i < count; i++) {
GstFluPSStream *stream = demux->streams_found[i];
if (stream) {
if (stream->last_ts == GST_CLOCK_TIME_NONE ||
stream->last_ts < demux->src_segment.start)
stream->last_ts = demux->src_segment.start;
if (stream->last_ts + stream->segment_thresh < new_time) {
stream->last_ts < demux->src_segment.start + base_time)
stream->last_ts = demux->src_segment.start + base_time;
if (stream->last_ts + stream->segment_thresh < new_start) {
#if 0
g_print ("Segment update to pad %s time %" GST_TIME_FORMAT " stop now %"
GST_TIME_FORMAT "\n", GST_PAD_NAME (stream->pad),
GST_TIME_ARGS (new_time), GST_TIME_ARGS (demux->src_segment.stop));
GST_TIME_ARGS (new_start), GST_TIME_ARGS (demux->src_segment.stop));
#endif
GST_DEBUG_OBJECT (demux,
"Segment update to pad %s time %" GST_TIME_FORMAT,
GST_PAD_NAME (stream->pad), GST_TIME_ARGS (new_time));
GST_PAD_NAME (stream->pad), GST_TIME_ARGS (new_start));
if (event == NULL) {
event = gst_event_new_new_segment_full (TRUE,
demux->src_segment.rate, demux->src_segment.applied_rate,
GST_FORMAT_TIME, new_time,
demux->src_segment.stop,
demux->src_segment.time + (new_time - demux->src_segment.start));
GST_FORMAT_TIME, new_start, stop, time);
}
gst_event_ref (event);
gst_pad_push_event (stream->pad, event);
stream->last_seg_start = stream->last_ts = new_time;
stream->last_seg_start = stream->last_ts = new_start;
stream->need_segment = FALSE;
}
}