mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 00:58:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioamplify: Don't declare a loop index static

Browse source 
The previous patch to add support for additional sample formats possibly
introduced a reentrancy bug:  a variable used for a loop index was declared
static.  This patch fixes that, and also adds a "/* *INDENT-ON* */" annotation
following the macro block.  (I don't know what the annotation is for, but the
adder, where I copied this from, has it).
This commit is contained in:
Kipp Cannon 2009-06-21 09:50:54 +02:00 committed by Sebastian Dröge
parent ffe64fb934
commit f80b62c3db
1 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
gst/audiofx/audioamplify.c
View file

@ -279,6 +279,7 @@ MAKE_INT_FUNCS (gint16)
MAKE_INT_FUNCS (gint32) MAKE_INT_FUNCS (gint32)
MAKE_FLOAT_FUNCS (gfloat) MAKE_FLOAT_FUNCS (gfloat)
MAKE_FLOAT_FUNCS (gdouble) MAKE_FLOAT_FUNCS (gdouble)
/* *INDENT-ON* */
/* GObject vmethod implementations */ /* GObject vmethod implementations */
@ -343,54 +344,56 @@ gst_audio_amplify_init (GstAudioAmplify * filter, GstAudioAmplifyClass * klass)
static GstAudioAmplifyProcessFunc static GstAudioAmplifyProcessFunc
gst_audio_amplify_process_function (gint clipping, gint format, gint width) gst_audio_amplify_process_function (gint clipping, gint format, gint width)
{ {
static const struct { static const struct process
{
gint format; gint format;
gint width; gint width;
gint clipping; gint clipping;
GstAudioAmplifyProcessFunc func; GstAudioAmplifyProcessFunc func;
} *p, process[] = { } process[] = {
{GST_BUFTYPE_FLOAT, 32, METHOD_CLIP, {
gst_audio_amplify_transform_gfloat_clip}, GST_BUFTYPE_FLOAT, 32, METHOD_CLIP,
{GST_BUFTYPE_FLOAT, 32, METHOD_WRAP_NEGATIVE, gst_audio_amplify_transform_gfloat_clip}, {
gst_audio_amplify_transform_gfloat_wrap_negative}, GST_BUFTYPE_FLOAT, 32, METHOD_WRAP_NEGATIVE,
{GST_BUFTYPE_FLOAT, 32, METHOD_WRAP_POSITIVE, gst_audio_amplify_transform_gfloat_wrap_negative}, {
gst_audio_amplify_transform_gfloat_wrap_positive}, GST_BUFTYPE_FLOAT, 32, METHOD_WRAP_POSITIVE,
{GST_BUFTYPE_FLOAT, 32, METHOD_NOCLIP, gst_audio_amplify_transform_gfloat_wrap_positive}, {
gst_audio_amplify_transform_gfloat_noclip}, GST_BUFTYPE_FLOAT, 32, METHOD_NOCLIP,
{GST_BUFTYPE_FLOAT, 64, METHOD_CLIP, gst_audio_amplify_transform_gfloat_noclip}, {
gst_audio_amplify_transform_gdouble_clip}, GST_BUFTYPE_FLOAT, 64, METHOD_CLIP,
{GST_BUFTYPE_FLOAT, 64, METHOD_WRAP_NEGATIVE, gst_audio_amplify_transform_gdouble_clip}, {
gst_audio_amplify_transform_gdouble_wrap_negative}, GST_BUFTYPE_FLOAT, 64, METHOD_WRAP_NEGATIVE,
{GST_BUFTYPE_FLOAT, 64, METHOD_WRAP_POSITIVE, gst_audio_amplify_transform_gdouble_wrap_negative}, {
gst_audio_amplify_transform_gdouble_wrap_positive}, GST_BUFTYPE_FLOAT, 64, METHOD_WRAP_POSITIVE,
{GST_BUFTYPE_FLOAT, 64, METHOD_NOCLIP, gst_audio_amplify_transform_gdouble_wrap_positive}, {
gst_audio_amplify_transform_gdouble_noclip}, GST_BUFTYPE_FLOAT, 64, METHOD_NOCLIP,
{GST_BUFTYPE_LINEAR, 8, METHOD_CLIP, gst_audio_amplify_transform_gdouble_noclip}, {
gst_audio_amplify_transform_gint8_clip}, GST_BUFTYPE_LINEAR, 8, METHOD_CLIP, gst_audio_amplify_transform_gint8_clip}, {
{GST_BUFTYPE_LINEAR, 8, METHOD_WRAP_NEGATIVE, GST_BUFTYPE_LINEAR, 8, METHOD_WRAP_NEGATIVE,
gst_audio_amplify_transform_gint8_wrap_negative}, gst_audio_amplify_transform_gint8_wrap_negative}, {
{GST_BUFTYPE_LINEAR, 8, METHOD_WRAP_POSITIVE, GST_BUFTYPE_LINEAR, 8, METHOD_WRAP_POSITIVE,
gst_audio_amplify_transform_gint8_wrap_positive}, gst_audio_amplify_transform_gint8_wrap_positive}, {
{GST_BUFTYPE_LINEAR, 8, METHOD_NOCLIP, GST_BUFTYPE_LINEAR, 8, METHOD_NOCLIP,
gst_audio_amplify_transform_gint8_noclip}, gst_audio_amplify_transform_gint8_noclip}, {
{GST_BUFTYPE_LINEAR, 16, METHOD_CLIP, GST_BUFTYPE_LINEAR, 16, METHOD_CLIP,
gst_audio_amplify_transform_gint16_clip}, gst_audio_amplify_transform_gint16_clip}, {
{GST_BUFTYPE_LINEAR, 16, METHOD_WRAP_NEGATIVE, GST_BUFTYPE_LINEAR, 16, METHOD_WRAP_NEGATIVE,
gst_audio_amplify_transform_gint16_wrap_negative}, gst_audio_amplify_transform_gint16_wrap_negative}, {
{GST_BUFTYPE_LINEAR, 16, METHOD_WRAP_POSITIVE, GST_BUFTYPE_LINEAR, 16, METHOD_WRAP_POSITIVE,
gst_audio_amplify_transform_gint16_wrap_positive}, gst_audio_amplify_transform_gint16_wrap_positive}, {
{GST_BUFTYPE_LINEAR, 16, METHOD_NOCLIP, GST_BUFTYPE_LINEAR, 16, METHOD_NOCLIP,
gst_audio_amplify_transform_gint16_noclip}, gst_audio_amplify_transform_gint16_noclip}, {
{GST_BUFTYPE_LINEAR, 32, METHOD_CLIP, GST_BUFTYPE_LINEAR, 32, METHOD_CLIP,
gst_audio_amplify_transform_gint32_clip}, gst_audio_amplify_transform_gint32_clip}, {
{GST_BUFTYPE_LINEAR, 32, METHOD_WRAP_NEGATIVE, GST_BUFTYPE_LINEAR, 32, METHOD_WRAP_NEGATIVE,
gst_audio_amplify_transform_gint32_wrap_negative}, gst_audio_amplify_transform_gint32_wrap_negative}, {
{GST_BUFTYPE_LINEAR, 32, METHOD_WRAP_POSITIVE, GST_BUFTYPE_LINEAR, 32, METHOD_WRAP_POSITIVE,
gst_audio_amplify_transform_gint32_wrap_positive}, gst_audio_amplify_transform_gint32_wrap_positive}, {
{GST_BUFTYPE_LINEAR, 32, METHOD_NOCLIP, GST_BUFTYPE_LINEAR, 32, METHOD_NOCLIP,
gst_audio_amplify_transform_gint32_noclip}, gst_audio_amplify_transform_gint32_noclip}, {
{0, 0, 0, NULL} 0, 0, 0, NULL}
}; };
const struct process *p;
for (p = process; p->func; p++) for (p = process; p->func; p++)
if (p->format == format && p->width == width && p->clipping == clipping) if (p->format == format && p->width == width && p->clipping == clipping)
@ -406,8 +409,7 @@ gst_audio_amplify_set_process_function (GstAudioAmplify * filter, gint
/* set processing function */ /* set processing function */
process = gst_audio_amplify_process_function (clipping_method, format, process = gst_audio_amplify_process_function (clipping_method, format, width);
width);
if (!process) { if (!process) {
GST_DEBUG ("wrong format"); GST_DEBUG ("wrong format");
return FALSE; return FALSE;