Commit 95448924 authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: K&R coding style

Originally committed as revision 19561 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6b620372
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#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)
...@@ -37,21 +36,18 @@ void ff_celp_convolve_circ( ...@@ -37,21 +36,18 @@ 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,
...@@ -64,17 +60,15 @@ int ff_celp_lp_synthesis_filter( ...@@ -64,17 +60,15 @@ int ff_celp_lp_synthesis_filter(
// 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,8 +78,7 @@ int ff_celp_lp_synthesis_filter( ...@@ -84,8 +78,7 @@ 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,
...@@ -96,16 +89,14 @@ void ff_celp_lp_synthesis_filterf( ...@@ -96,16 +89,14 @@ void ff_celp_lp_synthesis_filterf(
// 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,
...@@ -116,10 +107,9 @@ void ff_celp_lp_zero_synthesis_filterf( ...@@ -116,10 +107,9 @@ void ff_celp_lp_zero_synthesis_filterf(
// 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];
} }
} }
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
* *
* \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);
...@@ -60,8 +59,7 @@ void ff_celp_convolve_circ( ...@@ -60,8 +59,7 @@ 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,
...@@ -84,8 +82,7 @@ int ff_celp_lp_synthesis_filter( ...@@ -84,8 +82,7 @@ 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,
...@@ -106,8 +103,7 @@ void ff_celp_lp_synthesis_filterf( ...@@ -106,8 +103,7 @@ 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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment