g729dec: Add ff_ prefix to g729_postfilter() and g729_adaptive_gain_control()
authorVitor Sessak <vitor1001@gmail.com>
Sun, 25 Sep 2011 18:07:32 +0000 (20:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Sep 2011 19:13:19 +0000 (21:13 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/g729dec.c
libavcodec/g729postfilter.c
libavcodec/g729postfilter.h

index 62be55e..cbfaace 100644 (file)
@@ -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,
index 971c3d2..4f2f0c2 100644 (file)
@@ -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)
index 956cde9..067eb5d 100644 (file)
@@ -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