arm: fix av_clipl_int32() asm

[ffmpeg] / libavcodec / g729postfilter.c

diff --git a/libavcodec/g729postfilter.c b/libavcodec/g729postfilter.c
index 971c3d2ef6e8d1466fa1c441ab10235d71c53924..87472f694c96007b1ee30569f968fa15c32678fc 100644 (file)
--- a/libavcodec/g729postfilter.c
+++ b/libavcodec/g729postfilter.c
@@ -111,7 +111,7 @@ static int16_t long_term_filter(DSPContext *dsp, int pitch_delay_int,
                                 const int16_t* residual, int16_t *residual_filt,
                                 int subframe_size)
 {
-    int i, k, n, tmp, tmp2;
+    int i, k, tmp, tmp2;
     int sum;
     int L_temp0;
     int L_temp1;
@@ -433,7 +433,7 @@ static int16_t get_tilt_comp(DSPContext *dsp, int16_t *lp_gn,
     lp_gn[10] = 4096; //1.0 in (3.12)
 
     /* Apply 1/A(z/FORMANT_PP_FACTOR_DEN) filter to hf. */
-    ff_celp_lp_synthesis_filter(lp_gn + 11, lp_gd + 1, lp_gn + 11, 22, 10, 0, 0x800);
+    ff_celp_lp_synthesis_filter(lp_gn + 11, lp_gd + 1, lp_gn + 11, 22, 10, 0, 0, 0x800);
     /* Now lp_gn (starting with 10) contains impulse response
        of A(z/FORMANT_PP_FACTOR_NUM)/A(z/FORMANT_PP_FACTOR_DEN) filter. */
 
@@ -511,12 +511,12 @@ 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, int* 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)
 {
-    int16_t residual_filt_buf[SUBFRAME_SIZE+10];
+    int16_t residual_filt_buf[SUBFRAME_SIZE+11];
     int16_t lp_gn[33]; // (3.12)
     int16_t lp_gd[11]; // (3.12)
     int tilt_comp_coeff;
@@ -554,7 +554,7 @@ void g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing,
     /* Apply second half of short-term postfilter: 1/A(z/FORMANT_PP_FACTOR_DEN) */
     ff_celp_lp_synthesis_filter(pos_filter_data + 10, lp_gd + 1,
                                 residual_filt_buf + 10,
-                                subframe_size, 10, 0, 0x800);
+                                subframe_size, 10, 0, 0, 0x800);
     memcpy(pos_filter_data, pos_filter_data + subframe_size, 10 * sizeof(int16_t));
 
     *ht_prev_data = apply_tilt_comp(speech, pos_filter_data + 10, tilt_comp_coeff,
@@ -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)