har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetics: make celp_filters.* formatting more consistent with the rest of

Browse Source 
FFmpeg

Originally committed as revision 20885 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2009-12-16 17:15:57 +00:00
parent 6ef607c2d5
commit 5c910fcad8
2 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/celp_filters.c
View File

@ -25,10 +25,8 @@
#include "avcodec.h" #include "avcodec.h"
#include "celp_filters.h" #include "celp_filters.h"
void ff_celp_convolve_circ(int16_t* fc_out, void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in,
const int16_t* fc_in, const int16_t* filter, int len)
const int16_t* filter,
int len)
{ {
int i, k; 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]; out[k] = in[k] + fac * lagged[ k - lag];
} }
int ff_celp_lp_synthesis_filter(int16_t *out, int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs,
const int16_t* filter_coeffs, const int16_t *in, int buffer_length,
const int16_t* in, int filter_length, int stop_on_overflow,
int buffer_length,
int filter_length,
int stop_on_overflow,
int rounder) int rounder)
{ {
int i,n; int i,n;
@ -85,10 +80,8 @@ int ff_celp_lp_synthesis_filter(int16_t *out,
return 0; return 0;
} }
void ff_celp_lp_synthesis_filterf(float *out, void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
const float* filter_coeffs, const float* in, int buffer_length,
const float* in,
int buffer_length,
int filter_length) int filter_length)
{ {
int i,n; int i,n;
@ -195,10 +188,8 @@ void ff_celp_lp_synthesis_filterf(float *out,
} }
} }
void ff_celp_lp_zero_synthesis_filterf(float *out, void ff_celp_lp_zero_synthesis_filterf(float *out, const float *filter_coeffs,
const float* filter_coeffs, const float *in, int buffer_length,
const float* in,
int buffer_length,
int filter_length) int filter_length)
{ {
int i,n; int i,n;

27
libavcodec/celp_filters.h
View File

@ -36,10 +36,8 @@
* *
* \note fc_in and fc_out should not overlap! * \note fc_in and fc_out should not overlap!
*/ */
void ff_celp_convolve_circ(int16_t* fc_out, void ff_celp_convolve_circ(int16_t *fc_out, const int16_t *fc_in,
const int16_t* fc_in, const int16_t *filter, int len);
const int16_t* filter,
int len);
/** /**
* Add an array to a rotated array. * 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. * Routine applies 1/A(z) filter to given speech data.
*/ */
int ff_celp_lp_synthesis_filter(int16_t *out, int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs,
const int16_t* filter_coeffs, const int16_t *in, int buffer_length,
const int16_t* in, int filter_length, int stop_on_overflow,
int buffer_length,
int filter_length,
int stop_on_overflow,
int rounder); 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. * Routine applies 1/A(z) filter to given speech data.
*/ */
void ff_celp_lp_synthesis_filterf(float *out, void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
const float* filter_coeffs, const float *in, int buffer_length,
const float* in,
int buffer_length,
int filter_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. * Routine applies A(z) filter to given speech data.
*/ */
void ff_celp_lp_zero_synthesis_filterf(float *out, void ff_celp_lp_zero_synthesis_filterf(float *out, const float *filter_coeffs,
const float* filter_coeffs, const float *in, int buffer_length,
const float* in,
int buffer_length,
int filter_length); int filter_length);
#endif /* AVCODEC_CELP_FILTERS_H */ #endif /* AVCODEC_CELP_FILTERS_H */