# HG changeset patch # User vitor # Date 1260983757 0 # Node ID 63451af5f8f9e41a136ba6f0cf51921d8ebb4761 # Parent d124d9b688d0a5eeff007beb4f17ae6aa1587e11 Cosmetics: make celp_filters.* formatting more consistent with the rest of FFmpeg diff -r d124d9b688d0 -r 63451af5f8f9 celp_filters.c --- a/celp_filters.c Wed Dec 16 17:09:33 2009 +0000 +++ b/celp_filters.c Wed Dec 16 17:15:57 2009 +0000 @@ -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 @@ 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 @@ 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_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 -r d124d9b688d0 -r 63451af5f8f9 celp_filters.h --- a/celp_filters.h Wed Dec 16 17:09:33 2009 +0000 +++ b/celp_filters.h Wed Dec 16 17:15:57 2009 +0000 @@ -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 @@ * * 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 @@ * * 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 @@ * * 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 */