[FFmpeg-soc] [soc]: r5062 - in amr: amr-ffmpeg.diff amrnbdec.c

[cmcq]

Author: cmcq
Date: Thu Aug 13 10:17:42 2009
New Revision: 5062

Log:
Improve function name after discussion on ffmpeg-devel

Modified:
   amr/amr-ffmpeg.diff
   amr/amrnbdec.c

Modified: amr/amr-ffmpeg.diff
==============================================================================
--- amr/amr-ffmpeg.diff	Thu Aug 13 02:36:48 2009	(r5061)
+++ amr/amr-ffmpeg.diff	Thu Aug 13 10:17:42 2009	(r5062)
@@ -58,10 +58,10 @@ Index: libavcodec/acelp_filters.c
      }
  }
 +
-+void ff_acelp_high_pass_filterf(float *buf,
-+                                const float zero_coeffs[2],
-+                                const float pole_coeffs[2],
-+                                float gain, float mem[2], int n)
++void ff_acelp_apply_order_2_transfer_function(float *buf,
++                                              const float zero_coeffs[2],
++                                              const float pole_coeffs[2],
++                                              float gain, float mem[2], int n)
 +{
 +    int i;
 +    float tmp;
@@ -93,11 +93,11 @@ Index: libavcodec/acelp_filters.h
 + * @param mem intermediate values used by filter (should be 0 initially)
 + * @param n number of samples
 + */
-+void ff_acelp_high_pass_filterf(float *samples,
-+                                const float zero_coeffs[2],
-+                                const float pole_coeffs[2],
-+                                float gain,
-+                                float mem[2], int n);
++void ff_acelp_apply_order_2_transfer_function(float *samples,
++                                              const float zero_coeffs[2],
++                                              const float pole_coeffs[2],
++                                              float gain,
++                                              float mem[2], int n);
 +
  #endif /* AVCODEC_ACELP_FILTERS_H */
 Index: libavcodec/acelp_vectors.c

Modified: amr/amrnbdec.c
==============================================================================
--- amr/amrnbdec.c	Thu Aug 13 02:36:48 2009	(r5061)
+++ amr/amrnbdec.c	Thu Aug 13 10:17:42 2009	(r5062)
@@ -1266,9 +1266,9 @@ static int amrnb_decode_frame(AVCodecCon
         update_state(p);
     }
 
-    ff_acelp_high_pass_filterf(buf_out,
-                               highpass_zeros, highpass_poles, highpass_gain,
-                               p->high_pass_mem, AMR_BLOCK_SIZE);
+    ff_acelp_apply_order_2_transfer_function(buf_out, highpass_zeros,
+                                             highpass_poles, highpass_gain,
+                                             p->high_pass_mem, AMR_BLOCK_SIZE);
 
     for (i = 0; i < AMR_BLOCK_SIZE; i++)
         buf_out[i] = av_clipf(buf_out[i] * AMR_SAMPLE_SCALE,