From 5c910fcad8de393c38c696282fedbc1bbc75e5de Mon Sep 17 00:00:00 2001
From: Vitor Sessak <vitor1001@gmail.com>
Date: Wed, 16 Dec 2009 17:15:57 +0000
Subject: [PATCH] Cosmetics: make celp_filters.* formatting more consistent
with the rest of FFmpeg
Originally committed as revision 20885 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/celp_filters.c | 27 +++++++++------------------
libavcodec/celp_filters.h | 27 +++++++++------------------
2 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c
index 7f23acae006..e828e0611c6 100644
--- a/libavcodec/celp_filters.c
+++ b/libavcodec/celp_filters.c
@@ -25,10 +25,8 @@
#include "avcodec.h"
#include "celp_filters.h"
-void ff_celp_convolve_circ(int16_t* fc_out,
- const int16_t* fc_in,
- const int16_t* filter,
- int len)
+void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in,
+ const int16_t* filter, int len)
{
int i, k;
@@ -57,12 +55,9 @@ void ff_celp_circ_addf(float *out, const float *in,
out[k] = in[k] + fac * lagged[ k - lag];
}
-int ff_celp_lp_synthesis_filter(int16_t *out,
- const int16_t* filter_coeffs,
- const int16_t* in,
- int buffer_length,
- int filter_length,
- int stop_on_overflow,
+int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs,
+ const int16_t *in, int buffer_length,
+ int filter_length, int stop_on_overflow,
int rounder)
{
int i,n;
@@ -85,10 +80,8 @@ int ff_celp_lp_synthesis_filter(int16_t *out,
return 0;
}
-void ff_celp_lp_synthesis_filterf(float *out,
- const float* filter_coeffs,
- const float* in,
- int buffer_length,
+void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
+ const float* in, int buffer_length,
int filter_length)
{
int i,n;
@@ -195,10 +188,8 @@ void ff_celp_lp_synthesis_filterf(float *out,
}
}
-void ff_celp_lp_zero_synthesis_filterf(float *out,
- const float* filter_coeffs,
- const float* in,
- int buffer_length,
+void ff_celp_lp_zero_synthesis_filterf(float *out, const float *filter_coeffs,
+ const float *in, int buffer_length,
int filter_length)
{
int i,n;
diff --git a/libavcodec/celp_filters.h b/libavcodec/celp_filters.h
index 6069a3fcff0..7b64fc0306a 100644
--- a/libavcodec/celp_filters.h
+++ b/libavcodec/celp_filters.h
@@ -36,10 +36,8 @@
*
* \note fc_in and fc_out should not overlap!
*/
-void ff_celp_convolve_circ(int16_t* fc_out,
- const int16_t* fc_in,
- const int16_t* filter,
- int len);
+void ff_celp_convolve_circ(int16_t *fc_out, const int16_t *fc_in,
+ const int16_t *filter, int len);
/**
* Add an array to a rotated array.
@@ -74,12 +72,9 @@ void ff_celp_circ_addf(float *out, const float *in,
*
* Routine applies 1/A(z) filter to given speech data.
*/
-int ff_celp_lp_synthesis_filter(int16_t *out,
- const int16_t* filter_coeffs,
- const int16_t* in,
- int buffer_length,
- int filter_length,
- int stop_on_overflow,
+int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs,
+ const int16_t *in, int buffer_length,
+ int filter_length, int stop_on_overflow,
int rounder);
/**
@@ -98,10 +93,8 @@ int ff_celp_lp_synthesis_filter(int16_t *out,
*
* Routine applies 1/A(z) filter to given speech data.
*/
-void ff_celp_lp_synthesis_filterf(float *out,
- const float* filter_coeffs,
- const float* in,
- int buffer_length,
+void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
+ const float *in, int buffer_length,
int filter_length);
/**
@@ -119,10 +112,8 @@ void ff_celp_lp_synthesis_filterf(float *out,
*
* Routine applies A(z) filter to given speech data.
*/
-void ff_celp_lp_zero_synthesis_filterf(float *out,
- const float* filter_coeffs,
- const float* in,
- int buffer_length,
+void ff_celp_lp_zero_synthesis_filterf(float *out, const float *filter_coeffs,
+ const float *in, int buffer_length,
int filter_length);
#endif /* AVCODEC_CELP_FILTERS_H */
--
GitLab