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

Converting the code to use the modes instead of global arrays.

Browse source
This commit is contained in:
Jean-Marc Valin 2007-12-05 17:48:24 +11:00
parent ecb36a3323
commit 73e51b3e94
7 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libcelt/celt.c
View file

@ -62,15 +62,17 @@ struct CELTState_ {
CELTState *celt_encoder_new(int blockSize, int blocksPerFrame)
CELTState *celt_encoder_new(const CELTMode *mode)
{
int i, N;
N = blockSize;
int i, N, B;
N = mode->mdctSize;
B = mode->nbMdctBlocks;
CELTState *st = celt_alloc(sizeof(CELTState));
st->frame_size = blockSize * blocksPerFrame;
st->block_size = blockSize;
st->nb_blocks = blocksPerFrame;
st->mode = mode;
st->frame_size = B*N;
st->block_size = N;
st->nb_blocks = B;
mdct_init(&st->mdct_lookup, 2*N);
st->fft = spx_fft_init(MAX_PERIOD);
@ -197,11 +199,12 @@ int celt_encode(CELTState *st, short *pcm)
//haar1(P, B*N);
/* Band normalisation */
compute_bands(X, B, bandE);
normalise_bands(X, B, bandE);
compute_band_energies(st->mode, X, bandE);
normalise_bands(st->mode, X, bandE);
compute_bands(P, B, bandEp);
normalise_bands(P, B, bandEp);
//for (i=0;i<NBANDS;i++)printf("%f ", bandE[i]);printf("\n");
compute_band_energies(st->mode, P, bandEp);
normalise_bands(st->mode, P, bandEp);
/* Pitch prediction */
compute_pitch_gain(X, B, P, gains, bandE);