shortWindow hadn't been used for a while

This commit is contained in:
Jean-Marc Valin 2010-04-29 09:58:05 -04:00 committed by Jean-Marc Valin
parent f7547a4e8e
commit 5f633543c7
3 changed files with 1 additions and 3 deletions

View file

@ -147,7 +147,6 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
fprintf(file, "%d,\t/* nbShortMdcts */\n", mode->nbShortMdcts); fprintf(file, "%d,\t/* nbShortMdcts */\n", mode->nbShortMdcts);
fprintf(file, "%d,\t/* shortMdctSize */\n", mode->shortMdctSize); fprintf(file, "%d,\t/* shortMdctSize */\n", mode->shortMdctSize);
fprintf(file, "{%d, 0, 0},\t/* shortMdct */\n", 2*mode->mdctSize); fprintf(file, "{%d, 0, 0},\t/* shortMdct */\n", 2*mode->mdctSize);
fprintf(file, "window%d,\t/* shortWindow */\n", mode->overlap);
fprintf(file, "0,\t/* prob */\n"); fprintf(file, "0,\t/* prob */\n");
fprintf(file, "logN%d_%d,\t/* logN */\n", mode->Fs, mode->mdctSize); fprintf(file, "logN%d_%d,\t/* logN */\n", mode->Fs, mode->mdctSize);
fprintf(file, "0x%x,\t/* marker */\n", 0xa110ca7e); fprintf(file, "0x%x,\t/* marker */\n", 0xa110ca7e);

View file

@ -394,7 +394,7 @@ CELTMode *celt_mode_create(celt_int32 Fs, int frame_size, int *error)
mode->shortMdctSize = mode->mdctSize/mode->nbShortMdcts; mode->shortMdctSize = mode->mdctSize/mode->nbShortMdcts;
clt_mdct_init(&mode->shortMdct, 2*mode->shortMdctSize); clt_mdct_init(&mode->shortMdct, 2*mode->shortMdctSize);
mode->shortWindow = mode->window;
mode->prob = quant_prob_alloc(mode); mode->prob = quant_prob_alloc(mode);
if ((mode->mdct.trig==NULL) || (mode->shortMdct.trig==NULL) if ((mode->mdct.trig==NULL) || (mode->shortMdct.trig==NULL)
#ifndef ENABLE_TI_DSPLIB55 #ifndef ENABLE_TI_DSPLIB55

View file

@ -103,7 +103,6 @@ struct CELTMode {
int nbShortMdcts; int nbShortMdcts;
int shortMdctSize; int shortMdctSize;
mdct_lookup shortMdct; mdct_lookup shortMdct;
const celt_word16 *shortWindow;
int *prob; int *prob;
const celt_int16 *logN; const celt_int16 *logN;