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

This fixes the frame_size check on the encoder and decoder and removes some unused variable warnings when compiling without custom modes.

Browse source
This commit is contained in:
Gregory Maxwell 2011-02-03 21:06:43 -05:00 • committed by Jean-Marc Valin
parent a093f4df74
commit 95becbeec8
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libcelt/celt.c
View file

@ -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;

4
libcelt/modes.c
View file

@ -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);

2
libcelt/modes.h
View file

@ -41,8 +41,6 @@
#include "entenc.h"
#include "entdec.h"
#define MAX_CONFIG_SIZES 5
#define CELT_BITSTREAM_VERSION 0x8000000f
#define MAX_PERIOD 1024