RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics: K&R coding style 

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

30
libavcodec/celp_filters.c
View File

@ -25,8 +25,7 @@
#include "avcodec.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* filter,
int len)
@ -37,10 +36,8 @@ void ff_celp_convolve_circ(
/* 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. */
for(i=0; i<len; i++)
{
if(fc_in[i])
{
for (i = 0; i < len; i++) {
if (fc_in[i]) {
for (k = 0; k < i; k++)
fc_out[k] += (fc_in[i] * filter[len + k - i]) >> 15;
@ -50,8 +47,7 @@ void ff_celp_convolve_circ(
}
}
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* in,
int buffer_length,
@ -64,16 +60,14 @@ int ff_celp_lp_synthesis_filter(
// Avoids a +1 in the inner loop.
filter_length++;
for(n=0; n<buffer_length; n++)
{
for (n = 0; n < buffer_length; n++) {
int sum = rounder;
for (i = 1; i < filter_length; i++)
sum -= filter_coeffs[i-1] * out[n-i];
sum = (sum >> 12) + in[n];
if(sum + 0x8000 > 0xFFFFU)
{
if (sum + 0x8000 > 0xFFFFU) {
if (stop_on_overflow)
return 1;
sum = (sum >> 31) ^ 32767;
@ -84,8 +78,7 @@ int ff_celp_lp_synthesis_filter(
return 0;
}
void ff_celp_lp_synthesis_filterf(
float *out,
void ff_celp_lp_synthesis_filterf(float *out,
const float* filter_coeffs,
const float* in,
int buffer_length,
@ -96,16 +89,14 @@ void ff_celp_lp_synthesis_filterf(
// Avoids a +1 in the inner loop.
filter_length++;
for(n=0; n<buffer_length; n++)
{
for (n = 0; n < buffer_length; n++) {
out[n] = in[n];
for (i = 1; i < filter_length; i++)
out[n] -= filter_coeffs[i-1] * out[n-i];
}
}
void ff_celp_lp_zero_synthesis_filterf(
float *out,
void ff_celp_lp_zero_synthesis_filterf(float *out,
const float* filter_coeffs,
const float* in,
int buffer_length,
@ -116,8 +107,7 @@ void ff_celp_lp_zero_synthesis_filterf(
// Avoids a +1 in the inner loop.
filter_length++;
for(n=0; n<buffer_length; n++)
{
for (n = 0; n < buffer_length; n++) {
out[n] = in[n];
for (i = 1; i < filter_length; i++)
out[n] -= filter_coeffs[i-1] * in[n-i];

12
libavcodec/celp_filters.h
View File

@ -36,8 +36,7 @@
*
* \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* filter,
int len);
@ -60,8 +59,7 @@ void ff_celp_convolve_circ(
*
* 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* in,
int buffer_length,
@ -84,8 +82,7 @@ int ff_celp_lp_synthesis_filter(
*
* 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* in,
int buffer_length,
@ -106,8 +103,7 @@ void ff_celp_lp_synthesis_filterf(
*
* 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* in,
int buffer_length,