mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-25 01:54:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

ringbuffer: remove old _full version

Browse source
This commit is contained in:
Wim Taymans 2011-12-06 15:06:12 +01:00
parent 9e97260c9f
commit f096b8a8d8
3 changed files with 6 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/audio/gstaudiobasesink.c
View file

@ -1854,7 +1854,7 @@ no_sync:
data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ); data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ);
do { do {
written = written =
gst_audio_ring_buffer_commit_full (ringbuf, &sample_offset, gst_audio_ring_buffer_commit (ringbuf, &sample_offset,
data + offset, samples, out_samples, &accum); data + offset, samples, out_samples, &accum);
GST_DEBUG_OBJECT (sink, "wrote %u of %u", written, samples); GST_DEBUG_OBJECT (sink, "wrote %u of %u", written, samples);

35
gst-libs/gst/audio/gstaudioringbuffer.c
View file

@ -1491,7 +1491,7 @@ not_started:
} }
/** /**
* gst_audio_ring_buffer_commit_full: * gst_audio_ring_buffer_commit:
* @buf: the #GstAudioRingBuffer to commit * @buf: the #GstAudioRingBuffer to commit
* @sample: the sample position of the data * @sample: the sample position of the data
* @data: the data to commit * @data: the data to commit
@ -1499,7 +1499,7 @@ not_started:
* @out_samples: 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. * @accum: accumulator for rate conversion.
* *
* Commit @in_samples samples pointed to by @data to the ringbuffer @buf. * Commit @in_samples samples pointed to by @data to the ringbuffer @buf.
* *
* @in_samples and @out_samples define the rate conversion to perform on the * @in_samples and @out_samples define the rate conversion to perform on the
* samples in @data. For negative rates, @out_samples must be negative and * samples in @data. For negative rates, @out_samples must be negative and
@ -1510,7 +1510,7 @@ not_started:
* @sample in reverse order. * @sample in reverse order.
* *
* @out_samples does not need to be a multiple of the segment size of the ringbuffer * @out_samples does not need to be a multiple of the segment size of the ringbuffer
* although it is recommended for optimal performance. * although it is recommended for optimal performance.
* *
* @accum will hold a temporary accumulator used in rate conversion and should be * @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 * set to 0 when this function is first called. In case the commit operation is
@ -1526,7 +1526,7 @@ not_started:
* Since: 0.10.11. * Since: 0.10.11.
*/ */
guint guint
gst_audio_ring_buffer_commit_full (GstAudioRingBuffer * buf, guint64 * sample, gst_audio_ring_buffer_commit (GstAudioRingBuffer * buf, guint64 * sample,
guchar * data, gint in_samples, gint out_samples, gint * accum) guchar * data, gint in_samples, gint out_samples, gint * accum)
{ {
GstAudioRingBufferClass *rclass; GstAudioRingBufferClass *rclass;
@ -1545,33 +1545,6 @@ gst_audio_ring_buffer_commit_full (GstAudioRingBuffer * buf, guint64 * sample,
return res; return res;
} }
/**
* gst_audio_ring_buffer_commit:
* @buf: the #GstAudioRingBuffer to commit
* @sample: the sample position of the data
* @data: the data to commit
* @len: the number of samples in the data to commit
*
* Same as gst_audio_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.
*
* MT safe.
*/
guint
gst_audio_ring_buffer_commit (GstAudioRingBuffer * buf, guint64 sample,
guchar * data, guint len)
{
guint res;
guint64 samplep = sample;
res = gst_audio_ring_buffer_commit_full (buf, &samplep, data, len, len, NULL);
return res;
}
/** /**
* gst_audio_ring_buffer_read: * gst_audio_ring_buffer_read:
* @buf: the #GstAudioRingBuffer to read from * @buf: the #GstAudioRingBuffer to read from

4
gst-libs/gst/audio/gstaudioringbuffer.h
View file

@ -313,9 +313,7 @@ void gst_audio_ring_buffer_set_sample (GstAudioRingBuffer *buf,
void gst_audio_ring_buffer_clear_all (GstAudioRingBuffer *buf); void gst_audio_ring_buffer_clear_all (GstAudioRingBuffer *buf);
/* commit samples */ /* commit samples */
guint gst_audio_ring_buffer_commit (GstAudioRingBuffer *buf, guint64 sample, guint gst_audio_ring_buffer_commit (GstAudioRingBuffer * buf, guint64 *sample,
guchar *data, guint len);
guint gst_audio_ring_buffer_commit_full (GstAudioRingBuffer * buf, guint64 *sample,
guchar * data, gint in_samples, guchar * data, gint in_samples,
gint out_samples, gint * accum); gint out_samples, gint * accum);