ff_parse_close() is not the correct function for H264Context.

[ffmpeg] / libavcodec / acelp_filters.h

diff --git a/libavcodec/acelp_filters.h b/libavcodec/acelp_filters.h
index be2883c643d52cfdb090c95288f43a4168d0eeec..b2f05bc9f00b62e6b35997587af3d8b6b12a7cd5 100644 (file)
--- a/libavcodec/acelp_filters.h
+++ b/libavcodec/acelp_filters.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ACELP_FILTERS_H
-#define FFMPEG_ACELP_FILTERS_H
+#ifndef AVCODEC_ACELP_FILTERS_H
+#define AVCODEC_ACELP_FILTERS_H
 
 #include <stdint.h>
 
@@ -41,8 +41,8 @@ extern const int16_t ff_acelp_interp_filter[61];
  * @param out [out] buffer for interpolated data
  * @param in input data
  * @param filter_coeffs interpolation filter coefficients (0.15)
- * @param precision filter is able to interpolate with 1/precision precision of pitch delay
- * @param pitch_delay_frac pitch delay, fractional part [0..precision-1]
+ * @param precision sub sample factor, that is the precision of the position
+ * @param frac_pos fractional part of position [0..precision-1]
  * @param filter_length filter length
  * @param length length of output
  *
@@ -56,7 +56,7 @@ void ff_acelp_interpolate(
         const int16_t* in,
         const int16_t* filter_coeffs,
         int precision,
-        int pitch_delay_frac,
+        int frac_pos,
         int filter_length,
         int length);
 
@@ -75,7 +75,7 @@ void ff_acelp_convolve_circ(
         int16_t* fc_out,
         const int16_t* fc_in,
         const int16_t* filter,
-        int subframe_size);
+        int len);
 
 /**
  * LP synthesis filter.
@@ -104,21 +104,6 @@ int ff_acelp_lp_synthesis_filter(
         int stop_on_overflow,
         int rounder);
 
-/**
- * Calculates coefficients of weighted A(z/weight) filter.
- * @param out [out] weighted A(z/weight) result
- *                  filter (-0x8000 <= (3.12) < 0x8000)
- * @param in source filter (-0x8000 <= (3.12) < 0x8000)
- * @param weight_pow array containing weight^i (-0x8000 <= (0.15) < 0x8000)
- * @param filter_length filter length (11 for 10th order LP filter)
- *
- * out[i]=weight_pow[i]*in[i] , i=0..9
- */
-void ff_acelp_weighted_filter(
-        int16_t *out,
-        const int16_t* in,
-        const int16_t *weight_pow,
-        int filter_length);
 
 /**
  * high-pass filtering and upscaling (4.2.5 of G.729).
@@ -131,7 +116,7 @@ void ff_acelp_weighted_filter(
  * out[i] = 0.93980581 * in[i] - 1.8795834 * in[i-1] + 0.93980581 * in[i-2] +
  *          1.9330735 * out[i-1] - 0.93589199 * out[i-2]
  *
- * The filter has a cut-off frequency of 100Hz
+ * The filter has a cut-off frequency of 1/80 of the sampling freq
  *
  * @note Two items before the top of the out buffer must contain two items from the
  *       tail of the previous subframe.
@@ -149,4 +134,4 @@ void ff_acelp_high_pass_filter(
         const int16_t* in,
         int length);
 
-#endif /* FFMPEG_ACELP_FILTERS_H */
+#endif /* AVCODEC_ACELP_FILTERS_H */