Commit 95becbee authored by Gregory Maxwell's avatar Gregory Maxwell Committed by Jean-Marc Valin
Browse files

This fixes the frame_size check on the encoder and decoder and removes some...

This fixes the frame_size check on the encoder and decoder and removes some unused variable warnings when compiling without custom modes.
parent a093f4df
......@@ -923,10 +923,10 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
return CELT_BAD_ARG;
frame_size *= st->upsample;
for (LM=0;LM<4;LM++)
for (LM=0;LM<=st->mode->maxLM;LM++)
if (st->mode->shortMdctSize<<LM==frame_size)
break;
if (LM>=MAX_CONFIG_SIZES)
if (LM>st->mode->maxLM)
return CELT_BAD_ARG;
M=1<<LM;
N = M*st->mode->shortMdctSize;
......@@ -2178,10 +2178,10 @@ int celt_decode_with_ec_float(CELTDecoder * restrict st, const unsigned char *da
return CELT_BAD_ARG;
frame_size *= st->downsample;
for (LM=0;LM<4;LM++)
for (LM=0;LM<=st->mode->maxLM;LM++)
if (st->mode->shortMdctSize<<LM==frame_size)
break;
if (LM>=MAX_CONFIG_SIZES)
if (LM>st->mode->maxLM)
return CELT_BAD_ARG;
M=1<<LM;
......
......@@ -247,11 +247,13 @@ static void compute_allocation_table(CELTMode *mode)
CELTMode *celt_mode_create(celt_int32 Fs, int frame_size, int *error)
{
int i;
int res;
CELTMode *mode=NULL;
#ifdef CUSTOM_MODES
int res;
celt_word16 *window;
celt_int16 *logN;
int LM;
#endif
#ifdef STDIN_TUNING
scanf("%d ", &MIN_BINS);
scanf("%d ", &BITALLOC_SIZE);
......
......@@ -41,8 +41,6 @@
#include "entenc.h"
#include "entdec.h"
#define MAX_CONFIG_SIZES 5
#define CELT_BITSTREAM_VERSION 0x8000000f
#define MAX_PERIOD 1024
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment