From 951306959dd4e6a5f1d2d6046e941340abffee88 Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Mon, 29 Dec 2008 17:30:03 +0000 Subject: gst/mpegdemux/gstmpegdemux.c: Converting from time to bytes operates on the stream_time, not the SCR timeline. Original commit message from CVS: Patch by: Robin Stocker * gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_src_query): Converting from time to bytes operates on the stream_time, not the SCR timeline. The position reporting should happen in stream_time, not the segment timestamp range. See #557161. --- gst/mpegdemux/gstmpegdemux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gst') diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c index e4f13839..2b7f923f 100644 --- a/gst/mpegdemux/gstmpegdemux.c +++ b/gst/mpegdemux/gstmpegdemux.c @@ -55,7 +55,7 @@ /* We clamp scr delta with 0 so negative bytes won't be possible */ #define GSTTIME_TO_BYTES(time) \ - ((time != -1) ? gst_util_uint64_scale (MAX(0,(gint64) (GSTTIME_TO_MPEGTIME(time) - demux->first_scr)), demux->scr_rate_n, demux->scr_rate_d) : -1) + ((time != -1) ? gst_util_uint64_scale (MAX(0,(gint64) (GSTTIME_TO_MPEGTIME(time))), demux->scr_rate_n, demux->scr_rate_d) : -1) #define BYTES_TO_GSTTIME(bytes) ((bytes != -1) ? MPEGTIME_TO_GSTTIME(gst_util_uint64_scale (bytes, demux->scr_rate_d, demux->scr_rate_n)) : -1) #define ADAPTER_OFFSET_FLUSH(_bytes_) demux->adapter_offset += (_bytes_) @@ -895,8 +895,7 @@ gst_flups_demux_src_query (GstPad * pad, GstQuery * query) goto not_supported; } - position = demux->base_time + - MPEGTIME_TO_GSTTIME (demux->current_scr - demux->first_scr); + position = MPEGTIME_TO_GSTTIME (demux->current_scr - demux->first_scr); GST_LOG_OBJECT (demux, "Position at GStreamer Time:%" GST_TIME_FORMAT, GST_TIME_ARGS (position)); -- cgit v1.2.1