Code simplifications for log->amplitude conversion

This commit is contained in:
Jean-Marc Valin 2010-08-02 09:41:31 -04:00
parent 531f2ae7e3
commit bc272de74b
3 changed files with 20 additions and 20 deletions

View file

@ -1061,13 +1061,15 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
quant_energy_finalise(st->mode, st->start, st->end, bandE, st->oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-ec_enc_tell(enc, 0), enc, C);
#ifdef MEASURE_NORM_MSE
measure_norm_mse(st->mode, X, X0, bandE, bandE0, M, N, C);
#endif
/* Re-synthesis of the coded audio if required */
if (resynth)
{
log2Amp(st->mode, st->start, st->end, bandE, st->oldBandE, C);
#ifdef MEASURE_NORM_MSE
measure_norm_mse(st->mode, X, X0, bandE, bandE0, M, N, C);
#endif
if (st->pitch_available>0 && st->pitch_available<MAX_PERIOD)
st->pitch_available+=N;
@ -1828,6 +1830,8 @@ int celt_decode_with_ec_float(CELTDecoder * restrict st, const unsigned char *da
unquant_energy_finalise(st->mode, st->start, st->end, bandE, st->oldBandE, fine_quant, fine_priority, len*8-ec_dec_tell(dec, 0), dec, C);
log2Amp(st->mode, st->start, st->end, bandE, st->oldBandE, C);
if (mdct_weight_shift)
{
mdct_shape(st->mode, X, 0, mdct_weight_pos+1, N, mdct_weight_shift, effEnd, C, 1, M);