Originally committed as revision 20918 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -145,14 +145,13 @@ extern const float ff_pow_0_55[10]; |
| 145 | 145 |
* |
| 146 | 146 |
* Used in G.729 @8k, G.729 @4.4k, G.729 @6.4k, AMR @7.95k, AMR @7.40k |
| 147 | 147 |
*/ |
| 148 |
-void ff_acelp_fc_pulse_per_track( |
|
| 149 |
- int16_t* fc_v, |
|
| 150 |
- const uint8_t *tab1, |
|
| 151 |
- const uint8_t *tab2, |
|
| 152 |
- int pulse_indexes, |
|
| 153 |
- int pulse_signs, |
|
| 154 |
- int pulse_count, |
|
| 155 |
- int bits); |
|
| 148 |
+void ff_acelp_fc_pulse_per_track(int16_t* fc_v, |
|
| 149 |
+ const uint8_t *tab1, |
|
| 150 |
+ const uint8_t *tab2, |
|
| 151 |
+ int pulse_indexes, |
|
| 152 |
+ int pulse_signs, |
|
| 153 |
+ int pulse_count, |
|
| 154 |
+ int bits); |
|
| 156 | 155 |
|
| 157 | 156 |
/** |
| 158 | 157 |
* Decode the algebraic codebook index to pulse positions and signs and |
| ... | ... |
@@ -187,15 +186,14 @@ void ff_decode_10_pulses_35bits(const int16_t *fixed_index, |
| 187 | 187 |
* |
| 188 | 188 |
* out[i] = (in_a[i]*weight_a + in_b[i]*weight_b + rounder) >> shift |
| 189 | 189 |
*/ |
| 190 |
-void ff_acelp_weighted_vector_sum( |
|
| 191 |
- int16_t* out, |
|
| 192 |
- const int16_t *in_a, |
|
| 193 |
- const int16_t *in_b, |
|
| 194 |
- int16_t weight_coeff_a, |
|
| 195 |
- int16_t weight_coeff_b, |
|
| 196 |
- int16_t rounder, |
|
| 197 |
- int shift, |
|
| 198 |
- int length); |
|
| 190 |
+void ff_acelp_weighted_vector_sum(int16_t* out, |
|
| 191 |
+ const int16_t *in_a, |
|
| 192 |
+ const int16_t *in_b, |
|
| 193 |
+ int16_t weight_coeff_a, |
|
| 194 |
+ int16_t weight_coeff_b, |
|
| 195 |
+ int16_t rounder, |
|
| 196 |
+ int shift, |
|
| 197 |
+ int length); |
|
| 199 | 198 |
|
| 200 | 199 |
/** |
| 201 | 200 |
* float implementation of weighted sum of two vectors. |
| ... | ... |
@@ -209,7 +207,8 @@ void ff_acelp_weighted_vector_sum( |
| 209 | 209 |
* @note It is safe to pass the same buffer for out and in_a or in_b. |
| 210 | 210 |
*/ |
| 211 | 211 |
void ff_weighted_vector_sumf(float *out, const float *in_a, const float *in_b, |
| 212 |
- float weight_coeff_a, float weight_coeff_b, int length); |
|
| 212 |
+ float weight_coeff_a, float weight_coeff_b, |
|
| 213 |
+ int length); |
|
| 213 | 214 |
|
| 214 | 215 |
/** |
| 215 | 216 |
* Adaptative gain control (as used in AMR postfiltering) |