*
* Copyright (c) 2008 Vladimir Voroshilov
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdint.h>
/** Sparse representation for the algebraic codebook (fixed) vector */
-typedef struct {
+typedef struct AMRFixed {
int n;
int x[10];
float y[10];
*
* Table contains only first the pulse indexes.
*
- * Used in G.729 @8k, G.729 @4.4k, AMR @7.95k, AMR @7.40k
+ * Used in G.729 @@8k, G.729 @@4.4k, AMR @@7.95k, AMR @@7.40k
*/
extern const uint8_t ff_fc_4pulses_8bits_tracks_13[16];
*
* @remark Track in the table should be read top-to-bottom, left-to-right.
*
- * Used in G.729 @8k, G.729 @4.4k, AMR @7.95k, AMR @7.40k
+ * Used in G.729 @@8k, G.729 @@4.4k, AMR @@7.95k, AMR @@7.40k
*/
extern const uint8_t ff_fc_4pulses_8bits_track_4[32];
* @note (EE) Reference G.729D code also uses gray decoding for each
* pulse index before looking up the value in the table.
*
- * Used in G.729 @6.4k (with gray coding), AMR @5.9k (without gray coding)
+ * Used in G.729 @@6.4k (with gray coding), AMR @@5.9k (without gray coding)
*/
extern const uint8_t ff_fc_2pulses_9bits_track1[16];
extern const uint8_t ff_fc_2pulses_9bits_track1_gray[16];
-/**
- * Track|Pulse| Positions
- * -----------------------------------------
- * 2 | 1 | 0, 7, 14, 20, 27, 34, 1, 21
- * | | 2, 9, 15, 22, 29, 35, 6, 26
- * | | 4,10, 17, 24, 30, 37, 11, 31
- * | | 5,12, 19, 25, 32, 39, 16, 36
- * -----------------------------------------
- *
- * @remark Track in the table should be read top-to-bottom, left-to-right.
- *
- * @note (EE.1) This table (from the reference code) does not comply with
- * the specification.
- * The specification contains the following table:
- *
- * Track|Pulse| Positions
- * -----------------------------------------
- * 2 | 1 | 0, 5, 10, 15, 20, 25, 30, 35
- * | | 1, 6, 11, 16, 21, 26, 31, 36
- * | | 2, 7, 12, 17, 22, 27, 32, 37
- * | | 4, 9, 14, 19, 24, 29, 34, 39
- *
- * -----------------------------------------
- *
- * @note (EE.2) Reference G.729D code also uses gray decoding for each
- * pulse index before looking up the value in the table.
- *
- * Used in G.729 @6.4k (with gray coding)
- */
-extern const uint8_t ff_fc_2pulses_9bits_track2_gray[32];
-
/**
* b60 hamming windowed sinc function coefficients
*/
/**
* Decode fixed-codebook vector (3.8 and D.5.8 of G.729, 5.7.1 of AMR).
- * @param fc_v [out] decoded fixed codebook vector (2.13)
+ * @param[out] fc_v decoded fixed codebook vector (2.13)
* @param tab1 table used for first pulse_count pulses
* @param tab2 table used for last pulse
* @param pulse_indexes fixed codebook indexes
* @param pulse_count number of pulses decoded using first table
* @param bits length of one pulse index in bits
*
- * Used in G.729 @8k, G.729 @4.4k, G.729 @6.4k, AMR @7.95k, AMR @7.40k
+ * Used in G.729 @@8k, G.729 @@4.4k, G.729 @@6.4k, AMR @@7.95k, AMR @@7.40k
*/
void ff_acelp_fc_pulse_per_track(int16_t* fc_v,
const uint8_t *tab1,
/**
* weighted sum of two vectors with rounding.
- * @param out [out] result of addition
+ * @param[out] out result of addition
* @param in_a first vector
* @param in_b second vector
* @param weight_coeff_a first vector weight coefficient
/**
* float implementation of weighted sum of two vectors.
- * @param out [out] result of addition
+ * @param[out] out result of addition
* @param in_a first vector
* @param in_b second vector
* @param weight_coeff_a first vector weight coefficient
int length);
/**
- * Adaptative gain control (as used in AMR postfiltering)
+ * Adaptive gain control (as used in AMR postfiltering)
*
- * @param buf_out the input speech buffer
+ * @param out output buffer for filtered speech data
+ * @param in the input speech buffer (may be the same as out)
* @param speech_energ input energy
* @param size the input buffer size
* @param alpha exponential filter factor
* @param gain_mem a pointer to the filter memory (single float of size)
*/
-void ff_adaptative_gain_control(float *buf_out, float speech_energ,
- int size, float alpha, float *gain_mem);
+void ff_adaptive_gain_control(float *out, const float *in, float speech_energ,
+ int size, float alpha, float *gain_mem);
/**
* Set the sum of squares of a signal by scaling