diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-07-20 18:37:15 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-07-20 20:47:07 +0200 |
| commit | a005174b2500c180b9e7344d882af6cf79c79d8f (patch) | |
| tree | 0bd506bcbba9340dd2ea835482b2c3b02f7ca404 /libavcodec/acelp_pitch_delay.c | |
| parent | 80469eafb747018cb9d9a2547f65def715d073b2 (diff) | |
| download | ffmpeg-a005174b2500c180b9e7344d882af6cf79c79d8f.tar.gz | |
Remove unused code under G729_BITEXACT #ifdef.
G729_BITEXACT is never set, so the code is all dead code.
Diffstat (limited to 'libavcodec/acelp_pitch_delay.c')
| -rw-r--r-- | libavcodec/acelp_pitch_delay.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index 2b791b5aa3..395247dd2a 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -105,20 +105,9 @@ 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, |