Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / acelp_filters.c

diff --git a/libavcodec/acelp_filters.c b/libavcodec/acelp_filters.c
index 9f720a5b964c070c8e6c6edb30128f641dadf088..31f0e86f5bd1a75daef9b0be63222357e87252a0 100644 (file)
--- a/libavcodec/acelp_filters.c
+++ b/libavcodec/acelp_filters.c
@@ -45,7 +45,7 @@ void ff_acelp_interpolate(int16_t* out, const int16_t* in,
 {
     int n, i;
 
-    assert(pitch_delay_frac >= 0 && pitch_delay_frac < precision);
+    assert(frac_pos >= 0 && frac_pos < precision);
 
     for (n = 0; n < length; n++) {
         int idx = 0;
@@ -114,7 +114,7 @@ void ff_acelp_high_pass_filter(int16_t* out, int hpf_f[2],
     }
 }
 
-void ff_acelp_apply_order_2_transfer_function(float *buf,
+void ff_acelp_apply_order_2_transfer_function(float *out, const float *in,
                                               const float zero_coeffs[2],
                                               const float pole_coeffs[2],
                                               float gain, float mem[2], int n)
@@ -123,8 +123,8 @@ void ff_acelp_apply_order_2_transfer_function(float *buf,
     float tmp;
 
     for (i = 0; i < n; i++) {
-        tmp = gain * buf[i] - pole_coeffs[0] * mem[0] - pole_coeffs[1] * mem[1];
-        buf[i] =        tmp + zero_coeffs[0] * mem[0] + zero_coeffs[1] * mem[1];
+        tmp = gain * in[i] - pole_coeffs[0] * mem[0] - pole_coeffs[1] * mem[1];
+        out[i] =       tmp + zero_coeffs[0] * mem[0] + zero_coeffs[1] * mem[1];
 
         mem[1] = mem[0];
         mem[0] = tmp;