Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

g729dec: Add ff_ prefix to g729_postfilter() and g729_adaptive_gain_control()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Vitor Sessak 14 years ago committed by Michael Niedermayer
parent 9b3df9b6d3
commit 1c4712db81
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/g729dec.c
  2. 4
      libavcodec/g729postfilter.c
  3. 4
      libavcodec/g729postfilter.h

4
libavcodec/g729dec.c
Unescape View File

@ -649,7 +649,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
gain_before += FFABS(synth[j+10]); gain_before += FFABS(synth[j+10]);
/* Call postfilter and also update voicing decision for use in next frame. */ /* Call postfilter and also update voicing decision for use in next frame. */
g729_postfilter( ff_g729_postfilter(
&ctx->dsp, &ctx->dsp,
&ctx->ht_prev_data, &ctx->ht_prev_data,
&is_periodic, &is_periodic,
@ -666,7 +666,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
for(j=0; j<SUBFRAME_SIZE; j++) for(j=0; j<SUBFRAME_SIZE; j++)
gain_after += FFABS(synth[j+10]); gain_after += FFABS(synth[j+10]);
ctx->gain_coeff = g729_adaptive_gain_control( ctx->gain_coeff = ff_g729_adaptive_gain_control(
gain_before, gain_before,
gain_after, gain_after,
synth+10, synth+10,

4
libavcodec/g729postfilter.c
Unescape View File

@ -511,7 +511,7 @@ static int16_t apply_tilt_comp(int16_t* out, int16_t* res_pst, int refl_coeff,
return tmp; 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, const int16_t *lp_filter_coeffs, int pitch_delay_int,
int16_t* residual, int16_t* res_filter_data, int16_t* residual, int16_t* res_filter_data,
int16_t* pos_filter_data, int16_t *speech, int subframe_size) 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 * \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 subframe_size, int16_t gain_prev)
{ {
int gain; // (3.12) int gain; // (3.12)

4
libavcodec/g729postfilter.h
Unescape View File

@ -93,7 +93,7 @@
* Short-term postfilter (4.2.2). * Short-term postfilter (4.2.2).
* Tilt-compensation (4.2.3) * 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, const int16_t *lp_filter_coeffs, int pitch_delay_int,
int16_t* residual, int16_t* res_filter_data, int16_t* residual, int16_t* res_filter_data,
int16_t* pos_filter_data, int16_t *speech, 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 * \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); int subframe_size, int16_t gain_prev);
#endif // FFMPEG_G729POSTFILTER_H #endif // FFMPEG_G729POSTFILTER_H

Write Preview
Loading…
Cancel
Save