RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-12 10:29:39 +00:00
Code Issues Projects Releases Wiki Activity

cosmetics: K&R coding style

Browse Source 
Originally committed as revision 19561 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-08-02 10:34:30 +00:00
parent 6b620372a8
commit 954489244e
2 changed files with 54 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libavcodec/celp_filters.c
View File

@ -25,11 +25,10 @@
#include "avcodec.h" #include "avcodec.h"
#include "celp_filters.h" #include "celp_filters.h"
void ff_celp_convolve_circ( void ff_celp_convolve_circ(int16_t* fc_out,
int16_t* fc_out, const int16_t* fc_in,
const int16_t* fc_in, const int16_t* filter,
const int16_t* filter, int len)
int len)
{ {
int i, k; int i, k;
@ -37,44 +36,39 @@ void ff_celp_convolve_circ(
/* Since there are few pulses over an entire subframe (i.e. almost /* Since there are few pulses over an entire subframe (i.e. almost
all fc_in[i] are zero) it is faster to loop over fc_in first. */ all fc_in[i] are zero) it is faster to loop over fc_in first. */
for(i=0; i<len; i++) for (i = 0; i < len; i++) {
{ if (fc_in[i]) {
if(fc_in[i]) for (k = 0; k < i; k++)
{
for(k=0; k<i; k++)
fc_out[k] += (fc_in[i] * filter[len + k - i]) >> 15; fc_out[k] += (fc_in[i] * filter[len + k - i]) >> 15;
for(k=i; k<len; k++) for (k = i; k < len; k++)
fc_out[k] += (fc_in[i] * filter[ k - i]) >> 15; fc_out[k] += (fc_in[i] * filter[ k - i]) >> 15;
} }
} }
} }
int ff_celp_lp_synthesis_filter( int ff_celp_lp_synthesis_filter(int16_t *out,
int16_t *out, const int16_t* filter_coeffs,
const int16_t* filter_coeffs, const int16_t* in,
const int16_t* in, int buffer_length,
int buffer_length, int filter_length,
int filter_length, int stop_on_overflow,
int stop_on_overflow, int rounder)
int rounder)
{ {
int i,n; int i,n;
// Avoids a +1 in the inner loop. // Avoids a +1 in the inner loop.
filter_length++; filter_length++;
for(n=0; n<buffer_length; n++) for (n = 0; n < buffer_length; n++) {
{
int sum = rounder; int sum = rounder;
for(i=1; i<filter_length; i++) for (i = 1; i < filter_length; i++)
sum -= filter_coeffs[i-1] * out[n-i]; sum -= filter_coeffs[i-1] * out[n-i];
sum = (sum >> 12) + in[n]; sum = (sum >> 12) + in[n];
if(sum + 0x8000 > 0xFFFFU) if (sum + 0x8000 > 0xFFFFU) {
{ if (stop_on_overflow)
if(stop_on_overflow)
return 1; return 1;
sum = (sum >> 31) ^ 32767; sum = (sum >> 31) ^ 32767;
} }
@ -84,42 +78,38 @@ int ff_celp_lp_synthesis_filter(
return 0; return 0;
} }
void ff_celp_lp_synthesis_filterf( void ff_celp_lp_synthesis_filterf(float *out,
float *out, const float* filter_coeffs,
const float* filter_coeffs, const float* in,
const float* in, int buffer_length,
int buffer_length, int filter_length)
int filter_length)
{ {
int i,n; int i,n;
// Avoids a +1 in the inner loop. // Avoids a +1 in the inner loop.
filter_length++; filter_length++;
for(n=0; n<buffer_length; n++) for (n = 0; n < buffer_length; n++) {
{
out[n] = in[n]; out[n] = in[n];
for(i=1; i<filter_length; i++) for (i = 1; i < filter_length; i++)
out[n] -= filter_coeffs[i-1] * out[n-i]; out[n] -= filter_coeffs[i-1] * out[n-i];
} }
} }
void ff_celp_lp_zero_synthesis_filterf( void ff_celp_lp_zero_synthesis_filterf(float *out,
float *out, const float* filter_coeffs,
const float* filter_coeffs, const float* in,
const float* in, int buffer_length,
int buffer_length, int filter_length)
int filter_length)
{ {
int i,n; int i,n;
// Avoids a +1 in the inner loop. // Avoids a +1 in the inner loop.
filter_length++; filter_length++;
for(n=0; n<buffer_length; n++) for (n = 0; n < buffer_length; n++) {
{
out[n] = in[n]; out[n] = in[n];
for(i=1; i<filter_length; i++) for (i = 1; i < filter_length; i++)
out[n] -= filter_coeffs[i-1] * in[n-i]; out[n] -= filter_coeffs[i-1] * in[n-i];
} }
} }

46
libavcodec/celp_filters.h
View File

@ -36,11 +36,10 @@
* *
* \note fc_in and fc_out should not overlap! * \note fc_in and fc_out should not overlap!
*/ */
void ff_celp_convolve_circ( void ff_celp_convolve_circ(int16_t* fc_out,
int16_t* fc_out, const int16_t* fc_in,
const int16_t* fc_in, const int16_t* filter,
const int16_t* filter, int len);
int len);
/** /**
* LP synthesis filter. * LP synthesis filter.
@ -60,14 +59,13 @@ void ff_celp_convolve_circ(
* *
* 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( int ff_celp_lp_synthesis_filter(int16_t *out,
int16_t *out, const int16_t* filter_coeffs,
const int16_t* filter_coeffs, const int16_t* in,
const int16_t* in, int buffer_length,
int buffer_length, int filter_length,
int filter_length, int stop_on_overflow,
int stop_on_overflow, int rounder);
int rounder);
/** /**
* LP synthesis filter. * LP synthesis filter.
@ -84,12 +82,11 @@ int ff_celp_lp_synthesis_filter(
* *
* 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( void ff_celp_lp_synthesis_filterf(float *out,
float *out, const float* filter_coeffs,
const float* filter_coeffs, const float* in,
const float* in, int buffer_length,
int buffer_length, int filter_length);
int filter_length);
/** /**
* LP zero synthesis filter. * LP zero synthesis filter.
@ -106,11 +103,10 @@ void ff_celp_lp_synthesis_filterf(
* *
* 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( void ff_celp_lp_zero_synthesis_filterf(float *out,
float *out, const float* filter_coeffs,
const float* filter_coeffs, const float* in,
const float* in, int buffer_length,
int buffer_length, int filter_length);
int filter_length);
#endif /* AVCODEC_CELP_FILTERS_H */ #endif /* AVCODEC_CELP_FILTERS_H */