From cb0eaeadfd4fd7eb78d6c482bd1e2f76060493d8 Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Thu, 9 Apr 2015 17:35:55 +0100 Subject: [PATCH] tsdemux: fix segment position tracking for the general case Different streams can have different PTS/DTS bases, and some streams may not even have DTS. https://bugzilla.gnome.org/show_bug.cgi?id=745102 --- gst/mpegtsdemux/tsdemux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index 72e9b4b28e..ab9d700c5a 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -2221,7 +2221,11 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream) stream->discont = FALSE; if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (buffer))) - demux->segment.position = GST_BUFFER_DTS (buffer); + demux->segment.position = GST_BUFFER_DTS (buffer) - stream->first_dts; + else if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buffer))) + demux->segment.position = GST_BUFFER_PTS (buffer) - stream->first_dts; + if (demux->segment.position < 0) + demux->segment.position = 0; res = gst_pad_push (stream->pad, buffer); /* Record that a buffer was pushed */