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

tsdemux: Fix newsegment when switching programs

Browse source 
If a program/stream is changed, then a newsegment is sent which must
not be the same as the base segment since it happens later. We must
shift the start position by the time elapsed since the newsegment
and the current PTS of the stream
This commit is contained in:
Youness Alaoui 2011-08-16 22:05:14 +00:00 committed by Sebastian Dröge
parent 4cc1dfb360
commit 382710e200
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/mpegtsdemux/tsdemux.c
View file

@ -1946,6 +1946,8 @@ gst_ts_demux_parse_pes_header (GstTSDemux * demux, TSDemuxStream * stream)
#endif #endif
stream->pts = time = MPEGTIME_TO_GSTTIME (header.PTS); stream->pts = time = MPEGTIME_TO_GSTTIME (header.PTS);
GST_DEBUG_OBJECT (base, "stream PTS %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->pts));
/* safe default if insufficient upstream info */ /* safe default if insufficient upstream info */
if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (base->in_gap) && if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (base->in_gap) &&
@ -2070,8 +2072,10 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
MpegTSBase *base = (MpegTSBase *) demux; MpegTSBase *base = (MpegTSBase *) demux;
GstEvent *newsegmentevent; GstEvent *newsegmentevent;
gint64 start, stop, position; gint64 start, stop, position;
GstClockTime firstpts = GST_CLOCK_TIME_NONE;
GList *tmp;
GST_DEBUG ("Creating new newsegment"); GST_DEBUG ("Creating new newsegment for stream %p", stream);
/* Outgoing newsegment values /* Outgoing newsegment values
* start : The first/start PTS * start : The first/start PTS
@ -2083,6 +2087,13 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
* PTS to that remote clock). * PTS to that remote clock).
*/ */
for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
TSDemuxStream *pstream = (TSDemuxStream *) tmp->data;
if (!GST_CLOCK_TIME_IS_VALID (firstpts) || pstream->pts < firstpts)
firstpts = pstream->pts;
}
if (base->mode == BASE_MODE_PUSHING) { if (base->mode == BASE_MODE_PUSHING) {
/* FIXME : We're just ignore the upstream format for the time being */ /* FIXME : We're just ignore the upstream format for the time being */
/* FIXME : We should use base->segment.format and a upstream latency query /* FIXME : We should use base->segment.format and a upstream latency query
@ -2098,12 +2109,14 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
GST_TIME_ARGS (demux->segment.duration), GST_TIME_ARGS (demux->segment.duration),
GST_TIME_ARGS (demux->segment.time)); GST_TIME_ARGS (demux->segment.time));
if (demux->segment.time == 0 && base->segment.format == GST_FORMAT_TIME) GST_DEBUG ("stream pts: %" GST_TIME_FORMAT " first pts: %" GST_TIME_FORMAT,
demux->segment.time = base->segment.time; GST_TIME_ARGS (stream->pts), GST_TIME_ARGS (firstpts));
start = base->segment.start; start = base->segment.start;
stop = base->segment.stop; stop = base->segment.stop;
position = base->segment.time; /* Shift the start depending on our position in the stream */
start += firstpts + base->in_gap - base->first_buf_ts;
position = start;
} else { } else {
/* pull mode */ /* pull mode */
GST_DEBUG ("pull-based. Segment start:%" GST_TIME_FORMAT " duration:%" GST_DEBUG ("pull-based. Segment start:%" GST_TIME_FORMAT " duration:%"