diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2011-09-25 20:07:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-25 21:13:19 +0200 |
| commit | 1c4712db81fcf398a5f7b2a3e370aea655792b22 (patch) | |
| tree | 79fd7d199e3a6d3735255cb654487edc6764f144 | |
| parent | 9b3df9b6d364cbf15dd273095fea88fba39bb423 (diff) | |
| download | ffmpeg-1c4712db81fcf398a5f7b2a3e370aea655792b22.tar.gz | |
g729dec: Add ff_ prefix to g729_postfilter() and g729_adaptive_gain_control()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/g729dec.c | 4 | ||||
| -rw-r--r-- | libavcodec/g729postfilter.c | 4 | ||||
| -rw-r--r-- | libavcodec/g729postfilter.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 62be55e5ac..cbfaace5ed 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -649,7 +649,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, gain_before += FFABS(synth[j+10]); /* Call postfilter and also update voicing decision for use in next frame. */ - g729_postfilter( + ff_g729_postfilter( &ctx->dsp, &ctx->ht_prev_data, &is_periodic, @@ -666,7 +666,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, for(j=0; j<SUBFRAME_SIZE; j++) gain_after += FFABS(synth[j+10]); - ctx->gain_coeff = g729_adaptive_gain_control( + ctx->gain_coeff = ff_g729_adaptive_gain_control( gain_before, gain_after, synth+10, diff --git a/libavcodec/g729postfilter.c b/libavcodec/g729postfilter.c index 971c3d2ef6..4f2f0c2c18 100644 --- a/libavcodec/g729postfilter.c +++ b/libavcodec/g729postfilter.c @@ -511,7 +511,7 @@ static int16_t apply_tilt_comp(int16_t* out, int16_t* res_pst, int refl_coeff, return tmp; } -void g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing, +void ff_g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing, const int16_t *lp_filter_coeffs, int pitch_delay_int, int16_t* residual, int16_t* res_filter_data, int16_t* pos_filter_data, int16_t *speech, int subframe_size) @@ -571,7 +571,7 @@ void g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing, * * \return (3.12) last value of gain coefficient */ -int16_t g729_adaptive_gain_control(int gain_before, int gain_after, int16_t *speech, +int16_t ff_g729_adaptive_gain_control(int gain_before, int gain_after, int16_t *speech, int subframe_size, int16_t gain_prev) { int gain; // (3.12) diff --git a/libavcodec/g729postfilter.h b/libavcodec/g729postfilter.h index 956cde9ab7..067eb5ded9 100644 --- a/libavcodec/g729postfilter.h +++ b/libavcodec/g729postfilter.h @@ -93,7 +93,7 @@ * Short-term postfilter (4.2.2). * Tilt-compensation (4.2.3) */ -void g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing, +void ff_g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing, const int16_t *lp_filter_coeffs, int pitch_delay_int, int16_t* residual, int16_t* res_filter_data, int16_t* pos_filter_data, int16_t *speech, @@ -109,7 +109,7 @@ void g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing, * * \return (Q12) last value of gain coefficient */ -int16_t g729_adaptive_gain_control(int gain_before, int gain_after, int16_t *speech, +int16_t ff_g729_adaptive_gain_control(int gain_before, int gain_after, int16_t *speech, int subframe_size, int16_t gain_prev); #endif // FFMPEG_G729POSTFILTER_H |