mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: Don't provide bogus values in non-TIME push-mode

Browse source 
Only take the upstream segment values in GST_FORMAT_TIME
This commit is contained in:
Edward Hervey 2012-01-10 11:41:34 +01:00
parent 24408bce96
commit fcf511aa8f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/mpegtsdemux/tsdemux.c
View file

@ -2168,7 +2168,7 @@ 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 = 0, stop = GST_CLOCK_TIME_NONE, position = 0;
GstClockTime firstpts = GST_CLOCK_TIME_NONE; GstClockTime firstpts = GST_CLOCK_TIME_NONE;
GList *tmp; GList *tmp;
@ -2196,21 +2196,24 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
/* FIXME : We should use base->segment.format and a upstream latency query /* FIXME : We should use base->segment.format and a upstream latency query
* to decide if we need to use live values or not */ * to decide if we need to use live values or not */
GST_DEBUG ("push-based. base Segment start:%" GST_TIME_FORMAT " duration:%" GST_DEBUG ("push-based. base Segment start:%" GST_TIME_FORMAT " duration:%"
GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT, GST_TIME_FORMAT ", stop:%" GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT,
GST_TIME_ARGS (base->segment.start), GST_TIME_ARGS (base->segment.start),
GST_TIME_ARGS (base->segment.duration), GST_TIME_ARGS (base->segment.duration),
GST_TIME_ARGS (base->segment.time)); GST_TIME_ARGS (base->segment.stop), GST_TIME_ARGS (base->segment.time));
GST_DEBUG ("push-based. demux Segment start:%" GST_TIME_FORMAT " duration:%" GST_DEBUG ("push-based. demux Segment start:%" GST_TIME_FORMAT " duration:%"
GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT, GST_TIME_FORMAT ", stop:%" GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT,
GST_TIME_ARGS (demux->segment.start), GST_TIME_ARGS (demux->segment.start),
GST_TIME_ARGS (demux->segment.duration), GST_TIME_ARGS (demux->segment.duration),
GST_TIME_ARGS (demux->segment.stop),
GST_TIME_ARGS (demux->segment.time)); GST_TIME_ARGS (demux->segment.time));
GST_DEBUG ("stream pts: %" GST_TIME_FORMAT " first pts: %" GST_TIME_FORMAT, GST_DEBUG ("stream pts: %" GST_TIME_FORMAT " first pts: %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->pts), GST_TIME_ARGS (firstpts)); GST_TIME_ARGS (stream->pts), GST_TIME_ARGS (firstpts));
start = base->segment.start; if (base->segment.format == GST_FORMAT_TIME) {
stop = base->segment.stop; start = base->segment.start;
stop = base->segment.stop;
}
/* Shift the start depending on our position in the stream */ /* Shift the start depending on our position in the stream */
start += firstpts + base->in_gap - base->first_buf_ts; start += firstpts + base->in_gap - base->first_buf_ts;
position = start; position = start;