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

Further simplications to compute_mdcts()

Browse source
This commit is contained in:
Jean-Marc Valin 2010-10-24 00:22:45 -04:00
parent 933dd833b8
commit eedb42282a
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libcelt/celt.c
View file

@ -253,7 +253,6 @@ static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * rest
int N = mode->shortMdctSize<<LM; int N = mode->shortMdctSize<<LM;
int B = 1; int B = 1;
int b, c; int b, c;
VARDECL(celt_word32, x);
VARDECL(celt_word32, tmp); VARDECL(celt_word32, tmp);
SAVE_STACK; SAVE_STACK;
if (shortBlocks) if (shortBlocks)
@ -262,16 +261,13 @@ static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * rest
N = mode->shortMdctSize; N = mode->shortMdctSize;
B = shortBlocks; B = shortBlocks;
} }
ALLOC(x, N+overlap, celt_word32);
ALLOC(tmp, N, celt_word32); ALLOC(tmp, N, celt_word32);
for (c=0;c<C;c++) for (c=0;c<C;c++)
{ {
for (b=0;b<B;b++) for (b=0;b<B;b++)
{ {
int j; int j;
for (j=0;j<N+overlap;j++) clt_mdct_forward(&mode->mdct, in+c*(B*N+overlap)+b*N, tmp, mode->window, overlap, shortBlocks ? mode->maxLM : mode->maxLM-LM);
x[j] = in[(b*N+j)+c*(B*N+overlap)];
clt_mdct_forward(&mode->mdct, x, tmp, mode->window, overlap, shortBlocks ? mode->maxLM : mode->maxLM-LM);
/* Interleaving the sub-frames */ /* Interleaving the sub-frames */
for (j=0;j<N;j++) for (j=0;j<N;j++)
out[(j*B+b)+c*N*B] = tmp[j]; out[(j*B+b)+c*N*B] = tmp[j];