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

More preparation work for variable frame size

Browse source
This commit is contained in:
Jean-Marc Valin 2010-05-05 07:21:21 -04:00
parent 3b918bac54
commit 0475267e62
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libcelt/celt.c
View file

@ -82,8 +82,6 @@ static const float transientWindow[16] = {
struct CELTEncoder { struct CELTEncoder {
celt_uint32 marker; celt_uint32 marker;
const CELTMode *mode; /**< Mode used by the encoder */ const CELTMode *mode; /**< Mode used by the encoder */
int frame_size;
int block_size;
int overlap; int overlap;
int channels; int channels;
@ -133,7 +131,7 @@ static int check_encoder(const CELTEncoder *st)
CELTEncoder *celt_encoder_create(const CELTMode *mode, int channels, int *error) CELTEncoder *celt_encoder_create(const CELTMode *mode, int channels, int *error)
{ {
int N, C; int C;
CELTEncoder *st; CELTEncoder *st;
if (check_mode(mode) != CELT_OK) if (check_mode(mode) != CELT_OK)
@ -160,7 +158,6 @@ CELTEncoder *celt_encoder_create(const CELTMode *mode, int channels, int *error)
return NULL; return NULL;
} }
N = mode->mdctSize;
C = channels; C = channels;
st = celt_alloc(sizeof(CELTEncoder)); st = celt_alloc(sizeof(CELTEncoder));
@ -172,8 +169,6 @@ CELTEncoder *celt_encoder_create(const CELTMode *mode, int channels, int *error)
} }
st->marker = ENCODERPARTIAL; st->marker = ENCODERPARTIAL;
st->mode = mode; st->mode = mode;
st->frame_size = N;
st->block_size = N;
st->overlap = mode->overlap; st->overlap = mode->overlap;
st->channels = channels; st->channels = channels;
@ -604,7 +599,7 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig * pcm, celt_sig
ec_byte_writeinit_buffer(&buf, compressed, nbCompressedBytes); ec_byte_writeinit_buffer(&buf, compressed, nbCompressedBytes);
ec_enc_init(&enc,&buf); ec_enc_init(&enc,&buf);
N = st->block_size; N = M*st->mode->shortMdctSize;
N4 = (N-st->overlap)>>1; N4 = (N-st->overlap)>>1;
ALLOC(in, 2*C*N-2*C*N4, celt_sig); ALLOC(in, 2*C*N-2*C*N4, celt_sig);
@ -890,7 +885,7 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig * pcm, celt_sig
if (resynth) if (resynth)
{ {
if (st->pitch_available>0 && st->pitch_available<MAX_PERIOD) if (st->pitch_available>0 && st->pitch_available<MAX_PERIOD)
st->pitch_available+=st->frame_size; st->pitch_available+=N;
if (mdct_weight_shift) if (mdct_weight_shift)
{ {
@ -962,6 +957,7 @@ int celt_encode(CELTEncoder * restrict st, const celt_int16 * pcm, celt_int16 *
{ {
int j, ret, C, N; int j, ret, C, N;
VARDECL(celt_sig, in); VARDECL(celt_sig, in);
const int M=st->mode->nbShortMdcts;
SAVE_STACK; SAVE_STACK;
if (check_encoder(st) != CELT_OK) if (check_encoder(st) != CELT_OK)
@ -974,7 +970,7 @@ int celt_encode(CELTEncoder * restrict st, const celt_int16 * pcm, celt_int16 *
return CELT_BAD_ARG; return CELT_BAD_ARG;
C=CHANNELS(st->channels); C=CHANNELS(st->channels);
N=st->block_size; N=M*st->mode->shortMdctSize;
ALLOC(in, C*N, celt_sig); ALLOC(in, C*N, celt_sig);
for (j=0;j<C*N;j++) { for (j=0;j<C*N;j++) {
in[j] = SCALEOUT(pcm[j]); in[j] = SCALEOUT(pcm[j]);
@ -1048,11 +1044,13 @@ int celt_encoder_ctl(CELTEncoder * restrict st, int request, ...)
case CELT_SET_VBR_RATE_REQUEST: case CELT_SET_VBR_RATE_REQUEST:
{ {
celt_int32 value = va_arg(ap, celt_int32); celt_int32 value = va_arg(ap, celt_int32);
int N = st->mode->nbShortMdcts*st->mode->shortMdctSize;
if (value<0) if (value<0)
goto bad_arg; goto bad_arg;
if (value>3072000) if (value>3072000)
value = 3072000; value = 3072000;
st->vbr_rate = ((st->mode->Fs<<3)+(st->block_size>>1))/st->block_size; /* FIXME: We need to find a better way to do this if N is going to change */
st->vbr_rate = ((st->mode->Fs<<3)+(N>>1))/N;
st->vbr_rate = ((value<<7)+(st->vbr_rate>>1))/st->vbr_rate; st->vbr_rate = ((value<<7)+(st->vbr_rate>>1))/st->vbr_rate;
} }
break; break;
@ -1121,8 +1119,6 @@ bad_request:
struct CELTDecoder { struct CELTDecoder {
celt_uint32 marker; celt_uint32 marker;
const CELTMode *mode; const CELTMode *mode;
int frame_size;
int block_size;
int overlap; int overlap;
int channels; int channels;
@ -1162,7 +1158,7 @@ int check_decoder(const CELTDecoder *st)
CELTDecoder *celt_decoder_create(const CELTMode *mode, int channels, int *error) CELTDecoder *celt_decoder_create(const CELTMode *mode, int channels, int *error)
{ {
int N, C; int C;
CELTDecoder *st; CELTDecoder *st;
if (check_mode(mode) != CELT_OK) if (check_mode(mode) != CELT_OK)
@ -1189,7 +1185,6 @@ CELTDecoder *celt_decoder_create(const CELTMode *mode, int channels, int *error)
return NULL; return NULL;
} }
N = mode->mdctSize;
C = CHANNELS(channels); C = CHANNELS(channels);
st = celt_alloc(sizeof(CELTDecoder)); st = celt_alloc(sizeof(CELTDecoder));
@ -1202,8 +1197,6 @@ CELTDecoder *celt_decoder_create(const CELTMode *mode, int channels, int *error)
st->marker = DECODERPARTIAL; st->marker = DECODERPARTIAL;
st->mode = mode; st->mode = mode;
st->frame_size = N;
st->block_size = N;
st->overlap = mode->overlap; st->overlap = mode->overlap;
st->channels = channels; st->channels = channels;
@ -1276,9 +1269,9 @@ void celt_decoder_destroy(CELTDecoder *st)
celt_free(st); celt_free(st);
} }
static void celt_decode_lost(CELTDecoder * restrict st, celt_word16 * restrict pcm) static void celt_decode_lost(CELTDecoder * restrict st, celt_word16 * restrict pcm, int N)
{ {
int c, N; int c;
int pitch_index; int pitch_index;
int overlap = st->mode->overlap; int overlap = st->mode->overlap;
celt_word16 fade = Q15ONE; celt_word16 fade = Q15ONE;
@ -1287,7 +1280,6 @@ static void celt_decode_lost(CELTDecoder * restrict st, celt_word16 * restrict p
const int C = CHANNELS(st->channels); const int C = CHANNELS(st->channels);
int offset; int offset;
SAVE_STACK; SAVE_STACK;
N = st->block_size;
len = N+st->mode->overlap; len = N+st->mode->overlap;
@ -1479,7 +1471,7 @@ int celt_decode_float(CELTDecoder * restrict st, const unsigned char *data, int
if (pcm==NULL) if (pcm==NULL)
return CELT_BAD_ARG; return CELT_BAD_ARG;
N = st->block_size; N = M*st->mode->shortMdctSize;
N4 = (N-st->overlap)>>1; N4 = (N-st->overlap)>>1;
ALLOC(freq, C*N, celt_sig); /**< Interleaved signal MDCTs */ ALLOC(freq, C*N, celt_sig); /**< Interleaved signal MDCTs */
@ -1488,7 +1480,7 @@ int celt_decode_float(CELTDecoder * restrict st, const unsigned char *data, int
if (data == NULL) if (data == NULL)
{ {
celt_decode_lost(st, pcm); celt_decode_lost(st, pcm, N);
RESTORE_STACK; RESTORE_STACK;
return 0; return 0;
} }
@ -1638,7 +1630,7 @@ int celt_decode(CELTDecoder * restrict st, const unsigned char *data, int len, c
return CELT_BAD_ARG; return CELT_BAD_ARG;
C = CHANNELS(st->channels); C = CHANNELS(st->channels);
N = st->block_size; N = st->mode->nbShortMdcts*st->mode->shortMdctSize;
ALLOC(out, C*N, celt_sig); ALLOC(out, C*N, celt_sig);
ret=celt_decode_float(st, data, len, out); ret=celt_decode_float(st, data, len, out);