diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 19:39:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 19:39:18 +0200 |
| commit | 0b61af73823e88444b585c156d6c7b3677ce03bf (patch) | |
| tree | eb0bc3f8437d2bc071b84d13a995b6ac7251e314 /libavcodec/acelp_pitch_delay.c | |
| parent | 1aad9cd9d26adcca1d398a4cb3d67f89a6fa8967 (diff) | |
| download | ffmpeg-0b61af73823e88444b585c156d6c7b3677ce03bf.tar.gz | |
Restore WIP g729 code that has been remvoed by diego biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/acelp_pitch_delay.c')
| -rw-r--r-- | libavcodec/acelp_pitch_delay.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index c2155a5c0c..66d65a6903 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -105,9 +105,20 @@ int16_t ff_acelp_decode_gain_code( for(i=0; i<ma_pred_order; i++) mr_energy += quant_energy[i] * ma_prediction_coeff[i]; +#ifdef G729_BITEXACT + mr_energy += (((-6165LL * ff_log2(dsp->scalarproduct_int16(fc_v, fc_v, subframe_size, 0))) >> 3) & ~0x3ff); + + mr_energy = (5439 * (mr_energy >> 15)) >> 8; // (0.15) = (0.15) * (7.23) + + return bidir_sal( + ((ff_exp2(mr_energy & 0x7fff) + 16) >> 5) * (gain_corr_factor >> 1), + (mr_energy >> 15) - 25 + ); +#else mr_energy = gain_corr_factor * exp(M_LN10 / (20 << 23) * mr_energy) / sqrt(dsp->scalarproduct_int16(fc_v, fc_v, subframe_size, 0)); return mr_energy >> 12; +#endif } float ff_amr_set_fixed_gain(float fixed_gain_factor, float fixed_mean_energy, |