CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: wtay Date: Tue Jan 09 2007 11:16:09 UTC Log message: * ext/theora/theoradec.c: * ext/vorbis/vorbisdec.c: * gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_commit_full): * gst-libs/gst/audio/gstringbuffer.h: * gst-libs/gst/rtp/gstrtpbuffer.c: * gst-libs/gst/tag/gstvorbistag.c: Small documentation updates/fixes Modified files: . : ChangeLog ext/theora : theoradec.c ext/vorbis : vorbisdec.c gst-libs/gst/audio: gstringbuffer.c gstringbuffer.h gst-libs/gst/rtp: gstrtpbuffer.c gst-libs/gst/tag: gstvorbistag.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3073&r2=1.3074 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/theora/theoradec.c.diff?r1=1.86&r2=1.87 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/vorbis/vorbisdec.c.diff?r1=1.120&r2=1.121 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstringbuffer.c.diff?r1=1.53&r2=1.54 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstringbuffer.h.diff?r1=1.26&r2=1.27 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstrtpbuffer.c.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/tag/gstvorbistag.c.diff?r1=1.20&r2=1.21 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3073 retrieving revision 1.3074 diff -u -d -r1.3073 -r1.3074 --- ChangeLog 9 Jan 2007 10:37:01 -0000 1.3073 +++ ChangeLog 9 Jan 2007 11:15:56 -0000 1.3074 @@ -1,3 +1,14 @@ +2007-01-09 Wim Taymans <wi...@fl...> + + * ext/theora/theoradec.c: + * ext/vorbis/vorbisdec.c: + * gst-libs/gst/audio/gstringbuffer.c: + (gst_ring_buffer_commit_full): + * gst-libs/gst/audio/gstringbuffer.h: + * gst-libs/gst/rtp/gstrtpbuffer.c: + * gst-libs/gst/tag/gstvorbistag.c: + Small documentation updates/fixes 2007-01-09 Tim-Philipp Müller <tim at centricular dot net> * configure.ac: Index: theoradec.c RCS file: /cvs/gstreamer/gst-plugins-base/ext/theora/theoradec.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- theoradec.c 26 Nov 2006 16:39:41 -0000 1.86 +++ theoradec.c 9 Jan 2007 11:15:56 -0000 1.87 @@ -1269,7 +1269,7 @@ * head of the queue. * * Copy head of the gather queue (4) to decode queue, we flushed the gather - * queue an can now store input buffer in the gather queue: + * queue and can now store input buffer in the gather queue: * gather queue: 1 * decode queue: 4 Index: vorbisdec.c RCS file: /cvs/gstreamer/gst-plugins-base/ext/vorbis/vorbisdec.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- vorbisdec.c 5 Jan 2007 19:43:55 -0000 1.120 +++ vorbisdec.c 9 Jan 2007 11:15:56 -0000 1.121 @@ -1155,7 +1155,7 @@ * output queue: * When a DISCONT is received (buffer 4), we move the gather queue to the - * decode queue. This simply done be taking the head of the gather queue + * decode queue. This is simply done be taking the head of the gather queue * and prepending it to the decode queue. This yields: * * gather queue: @@ -1169,7 +1169,7 @@ * decode queue: 7 8 9 - * output queue: 8 9 + * output queue: 9 8 * Then we remove the consumed buffers from the decode queue. Buffer 7 is not * completely consumed, we need to keep it around for when we receive buffer Index: gstringbuffer.c RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstringbuffer.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- gstringbuffer.c 13 Nov 2006 17:30:17 -0000 1.53 +++ gstringbuffer.c 9 Jan 2007 11:15:57 -0000 1.54 @@ -20,7 +20,7 @@ /** * SECTION:gstringbuffer * @short_description: Base class for audio ringbuffer implementations - * @see_also: gstbaseaudiosink + * @see_also: #GstBaseAudioSink, #GstAudioSink * <refsect2> * <para> @@ -1267,23 +1267,29 @@ * @sample: the sample position of the data * @data: the data to commit * @in_samples: the number of samples in the data to commit - * @out_sampled: the number of samples to write to the ringbuffer + * @out_samples: the number of samples to write to the ringbuffer * @accum: accumulator for rate conversion. - * Commit @len samples pointed to by @data to the ringbuffer @buf. + * Commit @in_samples samples pointed to by @data to the ringbuffer @buf. - * @num and @denom define the rate conversion to perform on the the samples in - * @data. For negative rates, @num must be negative and @denom positive. + * @in_samples and @out_samples define the rate conversion to perform on the the + * samples in @data. For negative rates, @out_samples must be negative and + * @in_samples positive. - * When @num is positive, the first sample will be written at position @sample - * in the ringbuffer. When @num is negative, the last sample will be written to + * When @out_samples is positive, the first sample will be written at position @sample + * in the ringbuffer. When @out_samples is negative, the last sample will be written to * @sample in reverse order. - * @len does not need to be a multiple of the segment size of the ringbuffer (if - * @num and @denom are both 1) although it is recommended for optimal performance. + * @out_samples does not need to be a multiple of the segment size of the ringbuffer + * although it is recommended for optimal performance. + * + * @accum will hold a temporary accumulator used in rate conversion and should be + * set to 0 when this function is first called. In case the commit operation is + * interrupted, one can resume the processing by passing the previously returned + * @accum value back to this function. * Returns: The number of samples written to the ringbuffer or -1 on error. The - * number of samples written can be less than @len when @buf was interrupted + * number of samples written can be less than @out_samples when @buf was interrupted * with a flush or stop. * Since: 0.10.11. @@ -1430,8 +1436,8 @@ * @len: the number of samples in the data to commit - * Same as gst_ring_buffer_commit_full() but with a num, denom of 1, ignoring - * accum. + * Same as gst_ring_buffer_commit_full() but with a in_samples and out_samples + * equal to @len, ignoring accum. * Returns: The number of samples written to the ringbuffer or -1 on * error. Index: gstringbuffer.h RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstringbuffer.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- gstringbuffer.h 13 Nov 2006 17:30:17 -0000 1.26 +++ gstringbuffer.h 9 Jan 2007 11:15:57 -0000 1.27 @@ -193,7 +193,7 @@ guint64 latency_time; /* the required/actual latency time */ guint64 buffer_time; /* the required/actual time of the buffer */ - gint segsize; /* size of one buffer segement */ + gint segsize; /* size of one buffer segment in bytes */ gint segtotal; /* total number of segments */ /* out */ Index: gstrtpbuffer.c RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstrtpbuffer.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gstrtpbuffer.c 14 Sep 2006 20:09:19 -0000 1.8 +++ gstrtpbuffer.c 9 Jan 2007 11:15:57 -0000 1.9 @@ -795,7 +795,7 @@ * @buffer: the buffer * Create a buffer of the payload of the RTP packet in @buffer. This function - * will internally create a subbuffer of @buffer so that a memcopy can be + * will internally create a subbuffer of @buffer so that a memcpy can be * avoided. * Returns: A new buffer with the data of the payload. @@ -836,7 +836,7 @@ * Get a pointer to the payload data in @buffer. This pointer is valid as long - * as a reference to @buffer is helt. + * as a reference to @buffer is held. * Returns: A pointer to the payload data in @buffer. */ Index: gstvorbistag.c RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/tag/gstvorbistag.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gstvorbistag.c 3 Jan 2007 15:45:06 -0000 1.20 +++ gstvorbistag.c 9 Jan 2007 11:15:57 -0000 1.21 @@ -81,7 +81,7 @@ * gst_tag_from_vorbis_tag: * @vorbis_tag: vorbiscomment tag to convert to GStreamer tag - * Looks up the GStreamer tag for a vorbiscommment tag. + * Looks up the GStreamer tag for a vorbiscomment tag. * Returns: The corresponding GStreamer tag or NULL if none exists. @@ -110,9 +110,9 @@ * gst_tag_to_vorbis_tag: * @gst_tag: GStreamer tag to convert to vorbiscomment tag - * Looks up the vorbiscommment tag for a GStreamer tag. + * Looks up the vorbiscomment tag for a GStreamer tag. - * Returns: The corresponding vorbiscommment tag or NULL if none exists. + * Returns: The corresponding vorbiscomment tag or NULL if none exists. G_CONST_RETURN gchar * gst_tag_to_vorbis_tag (const gchar * gst_tag) |