eden-emu/opus
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code simplifications for log->amplitude conversion

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

20
libcelt/quant_bands.c
View file

@ -227,15 +227,6 @@ void quant_energy_finalise(const CELTMode *m, int start, int end, celt_ener *eBa
} while (++c < C);
}
}
c=0;
do {
for (i=start;i<m->nbEBands;i++)
{
eBands[i+c*m->nbEBands] = log2Amp(oldEBands[i+c*m->nbEBands]);
if (oldEBands[i+c*m->nbEBands] < -QCONST16(7.f,DB_SHIFT))
oldEBands[i+c*m->nbEBands] = -QCONST16(7.f,DB_SHIFT);
}
} while (++c < C);
}
void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_ener *eBands, celt_word16 *oldEBands, int intra, int *prob, ec_dec *dec, int _C, int LM)
@ -324,13 +315,22 @@ void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_ener *e
} while (++c < C);
}
}
}
void log2Amp(const CELTMode *m, int start, int end,
celt_ener *eBands, celt_word16 *oldEBands, int _C)
{
int c, i;
const int C = CHANNELS(_C);
c=0;
do {
for (i=start;i<m->nbEBands;i++)
{
eBands[i+c*m->nbEBands] = log2Amp(oldEBands[i+c*m->nbEBands]);
celt_word16 lg = oldEBands[i+c*m->nbEBands];
eBands[i+c*m->nbEBands] = PSHR32(celt_exp2(SHL16(lg,11-DB_SHIFT)),4);
if (oldEBands[i+c*m->nbEBands] < -QCONST16(7.f,DB_SHIFT))
oldEBands[i+c*m->nbEBands] = -QCONST16(7.f,DB_SHIFT);
}
} while (++c < C);
}