mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/volume/gstvolume.c: Enable liboil for float and add more details about problems with int16.

Browse source 
Original commit message from CVS:
* gst/volume/gstvolume.c:
Enable liboil for float and add more details about problems with
int16.
This commit is contained in:
Stefan Kost 2007-08-22 11:20:28 +00:00
parent 3e3b22148c
commit 64b4aedf97
2 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-08-22 Stefan Kost <ensonic@users.sf.net>
* gst/volume/gstvolume.c:
Enable liboil for float and add more details about problems with
int16.
2007-08-21 Wim Taymans <wim.taymans@gmail.com> 2007-08-21 Wim Taymans <wim.taymans@gmail.com>
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_palette_to_caps): * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_palette_to_caps):

40
gst/volume/gstvolume.c
View file

@ -396,37 +396,47 @@ static void
volume_process_float (GstVolume * this, gpointer bytes, guint n_bytes) volume_process_float (GstVolume * this, gpointer bytes, guint n_bytes)
{ {
gfloat *data = (gfloat *) bytes; gfloat *data = (gfloat *) bytes;
guint i, num_samples; guint num_samples = n_bytes / sizeof (gfloat);
num_samples = n_bytes / sizeof (gfloat); /*
guint i;
for (i = 0; i < num_samples; i++) { for (i = 0; i < num_samples; i++) {
*data++ *= this->real_vol_f; *data++ *= this->real_vol_f;
} }
/* FIXME: seems to be slower than above!
oil_scalarmultiply_f32_ns (data, data, &this->real_vol_f, num_samples);
*/ */
/* time gst-launch 2>/dev/null audiotestsrc wave=7 num-buffers=10000 ! audio/x-raw-float ! volume volume=1.5 ! fakesink
* goes from 0m0.850s -> 0m0.717s with liboil
*/
oil_scalarmultiply_f32_ns (data, data, &this->real_vol_f, num_samples);
} }
static void static void
volume_process_int16 (GstVolume * this, gpointer bytes, guint n_bytes) volume_process_int16 (GstVolume * this, gpointer bytes, guint n_bytes)
{ {
gint16 *data = (gint16 *) bytes; gint16 *data = (gint16 *) bytes;
guint i, num_samples; guint num_samples = n_bytes / sizeof (gint16);
#if 1
guint i;
gint val; gint val;
num_samples = n_bytes / sizeof (gint16);
/* FIXME: need... liboil...
* oil_scalarmultiply_s16_ns ?
* https://bugs.freedesktop.org/show_bug.cgi?id=7060
*/
for (i = 0; i < num_samples; i++) { for (i = 0; i < num_samples; i++) {
/* we use bitshifting instead of dividing by UNITY_INT for speed */ /* we use bitshifting instead of dividing by UNITY_INT for speed */
val = (gint) * data; val = (gint) * data;
*data++ = *data++ =
(gint16) ((this->real_vol_i * val) >> VOLUME_UNITY_INT16_BIT_SHIFT); (gint16) ((this->real_vol_i * val) >> VOLUME_UNITY_INT16_BIT_SHIFT);
} }
#else
/* FIXME: need oil_scalarmultiply_s16_ns ?
* https://bugs.freedesktop.org/show_bug.cgi?id=7060
* code below
* - crashes for volume<1.0
* - is not faster
* time gst-launch 2>/dev/null audiotestsrc wave=7 num-buffers=100 ! volume volume=1.5 ! fakesink
*/
oil_scalarmult_s16 (data, 0, data, 0,
((gint16 *) (void *) (&this->real_vol_i)), num_samples);
#endif
} }
static void static void