[gst-cvs] gst-ffmpeg: ffdec: rename time variable
Wim Taymans
wtay at kemper.freedesktop.org
Wed Oct 6 08:41:15 PDT 2010
Module: gst-ffmpeg
Branch: master
Commit: c330cdcc5df1d76e91ed51ba144f09b299a0da7a
URL: http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=c330cdcc5df1d76e91ed51ba144f09b299a0da7a
Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Wed Oct 6 12:26:09 2010 +0200
ffdec: rename time variable
Rename the time variable to avoid confusion with the time function.
Add some debug to the QoS update function.
---
ext/ffmpeg/gstffmpegdec.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 55db4da..44ef46f 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -506,11 +506,14 @@ gst_ffmpegdec_query (GstPad * pad, GstQuery * query)
static void
gst_ffmpegdec_update_qos (GstFFMpegDec * ffmpegdec, gdouble proportion,
- GstClockTime time)
+ GstClockTime timestamp)
{
+ GST_LOG_OBJECT (ffmpegdec, "update QOS: %f, %" GST_TIME_FORMAT,
+ proportion, GST_TIME_ARGS (timestamp));
+
GST_OBJECT_LOCK (ffmpegdec);
ffmpegdec->proportion = proportion;
- ffmpegdec->earliest_time = time;
+ ffmpegdec->earliest_time = timestamp;
GST_OBJECT_UNLOCK (ffmpegdec);
}
@@ -522,11 +525,11 @@ gst_ffmpegdec_reset_qos (GstFFMpegDec * ffmpegdec)
static void
gst_ffmpegdec_read_qos (GstFFMpegDec * ffmpegdec, gdouble * proportion,
- GstClockTime * time)
+ GstClockTime * timestamp)
{
GST_OBJECT_LOCK (ffmpegdec);
*proportion = ffmpegdec->proportion;
- *time = ffmpegdec->earliest_time;
+ *timestamp = ffmpegdec->earliest_time;
GST_OBJECT_UNLOCK (ffmpegdec);
}
More information about the Gstreamer-commits
mailing list