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

More work on decoding (still cheating)

Browse source
This commit is contained in:
Jean-Marc Valin 2007-12-07 15:36:39 +11:00
parent 0aa3903a4a
commit 671bf403e6
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libcelt/celt.c
View file

@ -44,7 +44,6 @@
/* This is only for cheating until the decoder is complete */ /* This is only for cheating until the decoder is complete */
float cheating_ebands[100]; float cheating_ebands[100];
float cheating_pitch_gains[100]; float cheating_pitch_gains[100];
float cheating_period;
struct CELTEncoder { struct CELTEncoder {
@ -86,6 +85,7 @@ CELTEncoder *celt_encoder_new(const CELTMode *mode)
st->nb_blocks = B; st->nb_blocks = B;
ec_byte_writeinit(&st->buf); ec_byte_writeinit(&st->buf);
ec_enc_init(&st->enc,&st->buf);
mdct_init(&st->mdct_lookup, 2*N); mdct_init(&st->mdct_lookup, 2*N);
st->fft = spx_fft_init(MAX_PERIOD); st->fft = spx_fft_init(MAX_PERIOD);
@ -181,10 +181,6 @@ int celt_encode(CELTEncoder *st, short *pcm)
float gains[st->mode->nbPBands]; float gains[st->mode->nbPBands];
int pitch_index; int pitch_index;
ec_byte_reset(&st->buf);
ec_enc_init(&st->enc,&st->buf);
for (i=0;i<N;i++) for (i=0;i<N;i++)
in[i] = st->in_mem[i]; in[i] = st->in_mem[i];
for (;i<(B+1)*N;i++) for (;i<(B+1)*N;i++)
@ -206,6 +202,7 @@ int celt_encode(CELTEncoder *st, short *pcm)
in[B*N+i] *= st->window[N+i]; in[B*N+i] *= st->window[N+i];
} }
find_spectral_pitch(st->fft, in, st->out_mem, MAX_PERIOD, (B+1)*N, &pitch_index); find_spectral_pitch(st->fft, in, st->out_mem, MAX_PERIOD, (B+1)*N, &pitch_index);
ec_enc_uint(&st->enc, pitch_index, MAX_PERIOD-(B+1)*N);
/* Compute MDCTs of the pitch part */ /* Compute MDCTs of the pitch part */
compute_mdcts(&st->mdct_lookup, st->window, st->out_mem+pitch_index, P, N, B); compute_mdcts(&st->mdct_lookup, st->window, st->out_mem+pitch_index, P, N, B);
@ -237,7 +234,6 @@ int celt_encode(CELTEncoder *st, short *pcm)
//quantise_pitch(gains, PBANDS); //quantise_pitch(gains, PBANDS);
pitch_quant_bands(st->mode, X, P, gains); pitch_quant_bands(st->mode, X, P, gains);
cheating_period = pitch_index;
for (i=0;i<st->mode->nbEBands;i++) for (i=0;i<st->mode->nbEBands;i++)
cheating_ebands[i] = bandE[i]; cheating_ebands[i] = bandE[i];
for (i=0;i<st->mode->nbPBands;i++) for (i=0;i<st->mode->nbPBands;i++)
@ -295,20 +291,29 @@ int celt_encode(CELTEncoder *st, short *pcm)
pcm[i*N+j] = (short)floor(.5+tmp); pcm[i*N+j] = (short)floor(.5+tmp);
} }
} }
ec_enc_done(&st->enc);
//printf ("%d\n", ec_byte_bytes(&st->buf));
return 0; return 0;
} }
char *celt_encoder_get_bytes(CELTEncoder *st, int *nbBytes) char *celt_encoder_get_bytes(CELTEncoder *st, int *nbBytes)
{ {
char *data;
ec_enc_done(&st->enc);
*nbBytes = ec_byte_bytes(&st->buf); *nbBytes = ec_byte_bytes(&st->buf);
return ec_byte_get_buffer(&st->buf); data = ec_byte_get_buffer(&st->buf);
//printf ("%d\n", *nbBytes);
/* Reset the packing for the next encoding */
ec_byte_reset(&st->buf);
ec_enc_init(&st->enc,&st->buf);
return data;
} }
/****************************************************************************/ /****************************************************************************/
/* Decoder */ /* */
/* DECODER */
/* */
/****************************************************************************/ /****************************************************************************/
@ -346,8 +351,6 @@ CELTDecoder *celt_decoder_new(const CELTMode *mode)
st->block_size = N; st->block_size = N;
st->nb_blocks = B; st->nb_blocks = B;
ec_byte_writeinit(&st->buf);
mdct_init(&st->mdct_lookup, 2*N); mdct_init(&st->mdct_lookup, 2*N);
st->window = celt_alloc(2*N*sizeof(float)); st->window = celt_alloc(2*N*sizeof(float));
@ -402,7 +405,7 @@ int celt_decode(CELTDecoder *st, char *data, int len, short *pcm)
bandE[i] = cheating_ebands[i]; bandE[i] = cheating_ebands[i];
/* Get the pitch index */ /* Get the pitch index */
pitch_index = cheating_period; pitch_index = ec_dec_uint(&dec, MAX_PERIOD-(B+1)*N);;
/* Pitch MDCT */ /* Pitch MDCT */
compute_mdcts(&st->mdct_lookup, st->window, st->out_mem+pitch_index, P, N, B); compute_mdcts(&st->mdct_lookup, st->window, st->out_mem+pitch_index, P, N, B);