Commit 51222d10 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

cosmetics: K&R style reformatting

Originally committed as revision 19088 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0e848977
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "acelp_filters.h" #include "acelp_filters.h"
const int16_t ff_acelp_interp_filter[61] = const int16_t ff_acelp_interp_filter[61] = { /* (0.15) */
{ /* (0.15) */
29443, 28346, 25207, 20449, 14701, 8693, 29443, 28346, 25207, 20449, 14701, 8693,
3143, -1352, -4402, -5865, -5850, -4673, 3143, -1352, -4402, -5865, -5850, -4673,
-2783, -672, 1211, 2536, 3130, 2991, -2783, -672, 1211, 2536, 3130, 2991,
...@@ -40,26 +39,19 @@ const int16_t ff_acelp_interp_filter[61] = ...@@ -40,26 +39,19 @@ const int16_t ff_acelp_interp_filter[61] =
0, 0,
}; };
void ff_acelp_interpolate( void ff_acelp_interpolate(int16_t* out, const int16_t* in,
int16_t* out, const int16_t* filter_coeffs, int precision,
const int16_t* in, int frac_pos, int filter_length, int length)
const int16_t* filter_coeffs,
int precision,
int frac_pos,
int filter_length,
int length)
{ {
int n, i; int n, i;
assert(pitch_delay_frac >= 0 && pitch_delay_frac < precision); assert(pitch_delay_frac >= 0 && pitch_delay_frac < precision);
for(n=0; n<length; n++) for (n = 0; n < length; n++) {
{
int idx = 0; int idx = 0;
int v = 0x4000; int v = 0x4000;
for(i=0; i<filter_length;) for (i = 0; i < filter_length;) {
{
/* The reference G.729 and AMR fixed point code performs clipping after /* The reference G.729 and AMR fixed point code performs clipping after
each of the two following accumulations. each of the two following accumulations.
...@@ -75,26 +67,22 @@ void ff_acelp_interpolate( ...@@ -75,26 +67,22 @@ void ff_acelp_interpolate(
i++; i++;
v += in[n - i] * filter_coeffs[idx - frac_pos]; v += in[n - i] * filter_coeffs[idx - frac_pos];
} }
if(av_clip_int16(v>>15) != (v>>15)) if (av_clip_int16(v >> 15) != (v >> 15))
av_log(NULL, AV_LOG_WARNING, "overflow that would need cliping in ff_acelp_interpolate()\n"); av_log(NULL, AV_LOG_WARNING, "overflow that would need cliping in ff_acelp_interpolate()\n");
out[n] = v >> 15; out[n] = v >> 15;
} }
} }
void ff_acelp_high_pass_filter( void ff_acelp_high_pass_filter(int16_t* out, int hpf_f[2],
int16_t* out, const int16_t* in, int length)
int hpf_f[2],
const int16_t* in,
int length)
{ {
int i; int i;
int tmp; int tmp;
for(i=0; i<length; i++) for (i = 0; i < length; i++) {
{ tmp = (hpf_f[0]* 15836LL) >> 13;
tmp = (hpf_f[0]* 15836LL)>>13; tmp += (hpf_f[1]* -7667LL) >> 13;
tmp += (hpf_f[1]* -7667LL)>>13;
tmp += 7699 * (in[i] - 2*in[i-1] + in[i-2]); tmp += 7699 * (in[i] - 2*in[i-1] + in[i-2]);
/* With "+0x800" rounding, clipping is needed /* With "+0x800" rounding, clipping is needed
......
...@@ -51,15 +51,9 @@ extern const int16_t ff_acelp_interp_filter[61]; ...@@ -51,15 +51,9 @@ extern const int16_t ff_acelp_interp_filter[61];
* See ff_acelp_interp_filter for an example. * See ff_acelp_interp_filter for an example.
* *
*/ */
void ff_acelp_interpolate( void ff_acelp_interpolate(int16_t* out, const int16_t* in,
int16_t* out, const int16_t* filter_coeffs, int precision,
const int16_t* in, int frac_pos, int filter_length, int length);
const int16_t* filter_coeffs,
int precision,
int frac_pos,
int filter_length,
int length);
/** /**
* high-pass filtering and upscaling (4.2.5 of G.729). * high-pass filtering and upscaling (4.2.5 of G.729).
...@@ -84,10 +78,7 @@ void ff_acelp_interpolate( ...@@ -84,10 +78,7 @@ void ff_acelp_interpolate(
* fixed-point all coefficients are the same as in G.729. Thus this * fixed-point all coefficients are the same as in G.729. Thus this
* routine can be used for the fixed-point AMR decoder, too. * routine can be used for the fixed-point AMR decoder, too.
*/ */
void ff_acelp_high_pass_filter( void ff_acelp_high_pass_filter(int16_t* out, int hpf_f[2],
int16_t* out, const int16_t* in, int length);
int hpf_f[2],
const int16_t* in,
int length);
#endif /* AVCODEC_ACELP_FILTERS_H */ #endif /* AVCODEC_ACELP_FILTERS_H */
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