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

fixed-point: got stereo to work again by fixing renormalise_bands()

Browse source
This commit is contained in:
Jean-Marc Valin 2008-02-26 20:32:24 +11:00
parent 2805a14eca
commit b30dd9e1bf
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libcelt/bands.c
View file

@ -112,14 +112,28 @@ void normalise_bands(const CELTMode *m, celt_sig_t *freq, celt_norm_t *X, celt_e
X[i] = 0; X[i] = 0;
} }
#ifdef FIXED_POINT
void renormalise_bands(const CELTMode *m, celt_norm_t *X)
{
int i;
VARDECL(celt_ener_t *tmpE);
VARDECL(celt_sig_t *freq);
ALLOC(tmpE, m->nbEBands*m->nbChannels, celt_ener_t);
ALLOC(freq, m->nbMdctBlocks*m->nbChannels*m->eBands[m->nbEBands+1], celt_sig_t);
for (i=0;i<m->nbMdctBlocks*m->nbChannels*m->eBands[m->nbEBands+1];i++)
freq[i] = SHL32(EXTEND32(X[i]), 10);
compute_band_energies(m, freq, tmpE);
normalise_bands(m, freq, X, tmpE);
}
#else
void renormalise_bands(const CELTMode *m, celt_norm_t *X) void renormalise_bands(const CELTMode *m, celt_norm_t *X)
{ {
VARDECL(celt_ener_t *tmpE); VARDECL(celt_ener_t *tmpE);
ALLOC(tmpE, m->nbEBands*m->nbChannels, celt_ener_t); ALLOC(tmpE, m->nbEBands*m->nbChannels, celt_ener_t);
compute_band_energies(m, X, tmpE); compute_band_energies(m, X, tmpE);
/* FIXME: This isn't right */
normalise_bands(m, X, X, tmpE); normalise_bands(m, X, X, tmpE);
} }
#endif
/* De-normalise the energy to produce the synthesis from the unit-energy bands */ /* De-normalise the energy to produce the synthesis from the unit-energy bands */
void denormalise_bands(const CELTMode *m, celt_norm_t *X, celt_sig_t *freq, celt_ener_t *bank) void denormalise_bands(const CELTMode *m, celt_norm_t *X, celt_sig_t *freq, celt_ener_t *bank)