-/* (C) 2007 Jean-Marc Valin, CSIRO
+/* (C) 2007-2008 Jean-Marc Valin, CSIRO
*/
/*
Redistribution and use in source and binary forms, with or without
#include "config.h"
#endif
+#define CELT_C
+
#include "os_support.h"
#include "mdct.h"
#include <math.h>
#include "quant_bands.h"
#include "psy.h"
#include "rate.h"
+#include "stack_alloc.h"
-#define MAX_PERIOD 1024
+static const celt_word16_t preemph = QCONST16(0.8f,15);
-#ifndef M_PI
-#define M_PI 3.14159263
-#endif
/** Encoder state
@brief Encoder state
ec_byte_buffer buf;
ec_enc enc;
- float preemph;
- float *preemph_memE;
- float *preemph_memD;
-
- mdct_lookup mdct_lookup;
+ celt_sig_t *preemph_memE;
+ celt_sig_t *preemph_memD;
+
kiss_fftr_cfg fft;
- struct PsyDecay psy;
-
- float *window;
+
celt_sig_t *in_mem;
celt_sig_t *mdct_overlap;
celt_sig_t *out_mem;
- float *oldBandE;
+ celt_word16_t *oldBandE;
};
-
-
-CELTEncoder *celt_encoder_create(const CELTMode *mode)
+CELTEncoder EXPORT *celt_encoder_create(const CELTMode *mode)
{
- int i, N, B, C, N4;
+ int N, B, C;
CELTEncoder *st;
if (check_mode(mode) != CELT_OK)
st->nb_blocks = B;
st->overlap = mode->overlap;
- N4 = (N-st->overlap)/2;
ec_byte_writeinit(&st->buf);
ec_enc_init(&st->enc,&st->buf);
- mdct_init(&st->mdct_lookup, 2*N);
- st->fft = kiss_fftr_alloc(MAX_PERIOD*C, 0, 0);
- psydecay_init(&st->psy, MAX_PERIOD*C/2, st->mode->Fs);
+ st->fft = pitch_state_alloc(MAX_PERIOD);
- st->window = celt_alloc(2*N*sizeof(float));
st->in_mem = celt_alloc(N*C*sizeof(celt_sig_t));
st->mdct_overlap = celt_alloc(N*C*sizeof(celt_sig_t));
st->out_mem = celt_alloc(MAX_PERIOD*C*sizeof(celt_sig_t));
- for (i=0;i<2*N;i++)
- st->window[i] = 0;
- for (i=0;i<st->overlap;i++)
- st->window[N4+i] = st->window[2*N-N4-i-1]
- = sin(.5*M_PI* sin(.5*M_PI*(i+.5)/st->overlap) * sin(.5*M_PI*(i+.5)/st->overlap));
- for (i=0;i<2*N4;i++)
- st->window[N-N4+i] = 1;
- st->oldBandE = celt_alloc(C*mode->nbEBands*sizeof(float));
-
- st->preemph = 0.8;
- st->preemph_memE = celt_alloc(C*sizeof(float));;
- st->preemph_memD = celt_alloc(C*sizeof(float));;
+
+ st->oldBandE = (celt_word16_t*)celt_alloc(C*mode->nbEBands*sizeof(celt_word16_t));
+
+ st->preemph_memE = (celt_sig_t*)celt_alloc(C*sizeof(celt_sig_t));;
+ st->preemph_memD = (celt_sig_t*)celt_alloc(C*sizeof(celt_sig_t));;
return st;
}
-void celt_encoder_destroy(CELTEncoder *st)
+void EXPORT celt_encoder_destroy(CELTEncoder *st)
{
if (st == NULL)
{
ec_byte_writeclear(&st->buf);
- mdct_clear(&st->mdct_lookup);
- kiss_fft_free(st->fft);
- psydecay_clear(&st->psy);
+ pitch_state_free(st->fft);
- celt_free(st->window);
celt_free(st->in_mem);
celt_free(st->mdct_overlap);
celt_free(st->out_mem);
celt_free(st);
}
+static inline celt_int16_t SIG2INT16(celt_sig_t x)
+{
+ x = PSHR32(x, SIG_SHIFT);
+ if (x>32767)
+ x = 32767;
+ else if (x<-32767)
+ x = -32767;
+#ifdef FIXED_POINT
+ return EXTRACT16(x);
+#else
+ return (celt_int16_t)floor(.5+x);
+#endif
+}
+
/** Apply window and compute the MDCT for all sub-frames and all channels in a frame */
-static float compute_mdcts(mdct_lookup *mdct_lookup, float *window, celt_sig_t *in, celt_sig_t *out, int N, int B, int C)
+static celt_word32_t compute_mdcts(const mdct_lookup *lookup, const celt_word16_t * restrict window, celt_sig_t *in, celt_sig_t *out, int N, int overlap, int B, int C)
{
- int i, c;
- float E = 1e-15;
- VARDECL(celt_word32_t *x);
- VARDECL(celt_word32_t *tmp);
+ int i, c, N4;
+ celt_word32_t E = 0;
+ VARDECL(celt_word32_t, x);
+ VARDECL(celt_word32_t, tmp);
+ SAVE_STACK;
+ N4 = (N-overlap)>>1;
ALLOC(x, 2*N, celt_word32_t);
ALLOC(tmp, N, celt_word32_t);
for (c=0;c<C;c++)
for (i=0;i<B;i++)
{
int j;
- for (j=0;j<2*N;j++)
+ for (j=0;j<2*N-2*N4;j++)
+ x[j+N4] = in[C*i*N+C*j+c];
+ for (j=0;j<overlap;j++)
{
- x[j] = window[j]*in[C*i*N+C*j+c];
- E += SIG_SCALING_1*SIG_SCALING_1*x[j]*x[j];
+ x[j+N4] = MULT16_32_Q15(window[j],x[j+N4]);
+ x[2*N-j-N4-1] = MULT16_32_Q15(window[j],x[2*N-j-N4-1]);
}
- mdct_forward(mdct_lookup, x, tmp);
+ for (j=0;j<N4;j++)
+ {
+ x[j] = 0;
+ x[2*N-j-1] = 0;
+ }
+ for (j=0;j<2*N;j++)
+ E += MULT16_16(EXTRACT16(SHR32(x[j],SIG_SHIFT+4)),EXTRACT16(SHR32(x[j],SIG_SHIFT+4)));
+ mdct_forward(lookup, x, tmp);
/* Interleaving the sub-frames */
for (j=0;j<N;j++)
out[C*B*j+C*i+c] = tmp[j];
}
}
+ RESTORE_STACK;
return E;
}
/** Compute the IMDCT and apply window for all sub-frames and all channels in a frame */
-static void compute_inv_mdcts(mdct_lookup *mdct_lookup, float *window, celt_sig_t *X, celt_sig_t *out_mem, celt_sig_t *mdct_overlap, int N, int overlap, int B, int C)
+static void compute_inv_mdcts(const mdct_lookup *lookup, const celt_word16_t * restrict window, celt_sig_t *X, celt_sig_t *out_mem, celt_sig_t *mdct_overlap, int N, int overlap, int B, int C)
{
int i, c, N4;
- VARDECL(celt_word32_t *x);
- VARDECL(celt_word32_t *tmp);
+ VARDECL(celt_word32_t, x);
+ VARDECL(celt_word32_t, tmp);
+ SAVE_STACK;
ALLOC(x, 2*N, celt_word32_t);
ALLOC(tmp, N, celt_word32_t);
- N4 = (N-overlap)/2;
+ N4 = (N-overlap)>>1;
for (c=0;c<C;c++)
{
for (i=0;i<B;i++)
/* De-interleaving the sub-frames */
for (j=0;j<N;j++)
tmp[j] = X[C*B*j+C*i+c];
- mdct_backward(mdct_lookup, tmp, x);
- for (j=0;j<2*N;j++)
- x[j] = window[j]*x[j];
+ mdct_backward(lookup, tmp, x);
+ /* The first and last part would need to be set to zero if we actually
+ wanted to use them. */
+ for (j=0;j<overlap;j++)
+ {
+ x[j+N4] = MULT16_32_Q15(window[j],x[j+N4]);
+ x[2*N-j-N4-1] = MULT16_32_Q15(window[j],x[2*N-j-N4-1]);
+ }
for (j=0;j<overlap;j++)
out_mem[C*(MAX_PERIOD+(i-B)*N)+C*j+c] = 2*(x[N4+j]+mdct_overlap[C*j+c]);
for (j=0;j<2*N4;j++)
mdct_overlap[C*j+c] = x[N+N4+j];
}
}
+ RESTORE_STACK;
}
-int celt_encode(CELTEncoder *st, celt_int16_t *pcm, unsigned char *compressed, int nbCompressedBytes)
+int EXPORT celt_encode(CELTEncoder *st, celt_int16_t *pcm, unsigned char *compressed, int nbCompressedBytes)
{
int i, c, N, B, C, N4;
int has_pitch;
int pitch_index;
- float curr_power, pitch_power;
- VARDECL(celt_sig_t *in);
- VARDECL(celt_sig_t *freq);
- VARDECL(celt_norm_t *X);
- VARDECL(celt_norm_t *P);
- VARDECL(celt_ener_t *bandE);
- VARDECL(celt_pgain_t *gains);
+ celt_word32_t curr_power, pitch_power;
+ VARDECL(celt_sig_t, in);
+ VARDECL(celt_sig_t, freq);
+ VARDECL(celt_norm_t, X);
+ VARDECL(celt_norm_t, P);
+ VARDECL(celt_ener_t, bandE);
+ VARDECL(celt_pgain_t, gains);
+ SAVE_STACK;
if (check_mode(st->mode) != CELT_OK)
return CELT_INVALID_MODE;
N = st->block_size;
B = st->nb_blocks;
C = st->mode->nbChannels;
- ALLOC(in, (B+1)*C*N, celt_sig_t);
- ALLOC(freq, B*C*N, celt_sig_t); /**< Interleaved signal MDCTs */
- ALLOC(X, B*C*N, celt_norm_t); /**< Interleaved normalised MDCTs */
- ALLOC(P, B*C*N, celt_norm_t); /**< Interleaved normalised pitch MDCTs*/
- ALLOC(bandE,st->mode->nbEBands*C, celt_ener_t);
- ALLOC(gains,st->mode->nbPBands, celt_pgain_t);
+ N4 = (N-st->overlap)>>1;
+ ALLOC(in, (B+1)*C*N-2*N4, celt_sig_t);
- N4 = (N-st->overlap)/2;
for (c=0;c<C;c++)
{
- for (i=0;i<N4;i++)
- in[C*i+c] = 0;
for (i=0;i<st->overlap;i++)
- in[C*(i+N4)+c] = st->in_mem[C*i+c];
+ in[C*i+c] = st->in_mem[C*i+c];
for (i=0;i<B*N;i++)
{
- float tmp = SIG_SCALING*pcm[C*i+c];
- in[C*(i+st->overlap+N4)+c] = tmp - st->preemph*st->preemph_memE[c];
+ celt_sig_t tmp = SHL32(EXTEND32(pcm[C*i+c]), SIG_SHIFT);
+ in[C*(i+st->overlap)+c] = SUB32(tmp, MULT16_32_Q15(preemph,st->preemph_memE[c]));
st->preemph_memE[c] = tmp;
}
- for (i=N*(B+1)-N4;i<N*(B+1);i++)
- in[C*i+c] = 0;
for (i=0;i<st->overlap;i++)
- st->in_mem[C*i+c] = in[C*(N*(B+1)-N4-st->overlap+i)+c];
+ st->in_mem[C*i+c] = in[C*(N*(B+1)-2*N4-st->overlap+i)+c];
}
+ /* Pitch analysis: we do it early to save on the peak stack space */
+ find_spectral_pitch(st->fft, &st->mode->psy, in, st->out_mem, st->mode->window, st->overlap, MAX_PERIOD, (B+1)*N-2*N4, C, &pitch_index);
+
+ ALLOC(freq, B*C*N, celt_sig_t); /**< Interleaved signal MDCTs */
+
/*for (i=0;i<(B+1)*C*N;i++) printf ("%f(%d) ", in[i], i); printf ("\n");*/
/* Compute MDCTs */
- curr_power = compute_mdcts(&st->mdct_lookup, st->window, in, freq, N, B, C);
+ curr_power = compute_mdcts(&st->mode->mdct, st->mode->window, in, freq, N, st->overlap, B, C);
#if 0 /* Mask disabled until it can be made to do something useful */
compute_mdct_masking(X, mask, B*C*N, st->Fs);
for (i=0;i<B*C*N;i++)
mask[i] = 1/(.1+mask[i]);
#endif
- /* Pitch analysis */
- for (c=0;c<C;c++)
- {
- for (i=0;i<N;i++)
- {
- in[C*i+c] *= st->window[i];
- in[C*(B*N+i)+c] *= st->window[N+i];
- }
- }
- find_spectral_pitch(st->fft, &st->psy, in, st->out_mem, MAX_PERIOD, (B+1)*N, C, &pitch_index);
+ /* Deferred allocation after find_spectral_pitch() to reduce the peak memory usage */
+ ALLOC(X, B*C*N, celt_norm_t); /**< Interleaved normalised MDCTs */
+ ALLOC(P, B*C*N, celt_norm_t); /**< Interleaved normalised pitch MDCTs*/
+ ALLOC(bandE,st->mode->nbEBands*C, celt_ener_t);
+ ALLOC(gains,st->mode->nbPBands, celt_pgain_t);
+
/*printf ("%f %f\n", curr_power, pitch_power);*/
/*int j;
for (j=0;j<B*N;j++)
/*for (i=0;i<N*B*C;i++)printf("%f ", X[i]);printf("\n");*/
/* Compute MDCTs of the pitch part */
- pitch_power = compute_mdcts(&st->mdct_lookup, st->window, st->out_mem+pitch_index*C, freq, N, B, C);
+ pitch_power = compute_mdcts(&st->mode->mdct, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap, B, C);
quant_energy(st->mode, bandE, st->oldBandE, nbCompressedBytes*8/3, &st->enc);
}
/* Check if we can safely use the pitch (i.e. effective gain isn't too high) */
- if (curr_power + 1e5f < 10.f*pitch_power)
+ if (MULT16_32_Q15(QCONST16(.1f, 15),curr_power) + SHR16(10000,8) < pitch_power)
{
/* Normalise the pitch vector as well (discard the energies) */
- VARDECL(celt_ener_t *bandEp);
+ VARDECL(celt_ener_t, bandEp);
ALLOC(bandEp, st->mode->nbEBands*st->mode->nbChannels, celt_ener_t);
compute_band_energies(st->mode, freq, bandEp);
normalise_bands(st->mode, freq, P, bandEp);
X[i*C+1] = P[i*C+1] = 0;*/
/* Pitch prediction */
- compute_pitch_gain(st->mode, X, P, gains, bandE);
+ compute_pitch_gain(st->mode, X, P, gains);
has_pitch = quant_pitch(gains, st->mode->nbPBands, &st->enc);
if (has_pitch)
- ec_enc_uint(&st->enc, pitch_index, MAX_PERIOD-(B+1)*N);
+ ec_enc_uint(&st->enc, pitch_index, MAX_PERIOD-((B+1)*N-2*N4));
} else {
/* No pitch, so we just pretend we found a gain of zero */
for (i=0;i<st->mode->nbPBands;i++)
}
- pitch_quant_bands(st->mode, X, P, gains);
+ pitch_quant_bands(st->mode, P, gains);
/*for (i=0;i<B*N;i++) printf("%f ",P[i]);printf("\n");*/
/* Compute residual that we're going to encode */
for (i=0;i<B*C*N;i++)
X[i] -= P[i];
- /*float sum=0;
- for (i=0;i<B*N;i++)
- sum += X[i]*X[i];
- printf ("%f\n", sum);*/
/* Residual quantisation */
quant_bands(st->mode, X, P, NULL, nbCompressedBytes*8, &st->enc);
CELT_MOVE(st->out_mem, st->out_mem+C*B*N, C*(MAX_PERIOD-B*N));
- compute_inv_mdcts(&st->mdct_lookup, st->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, B, C);
+ compute_inv_mdcts(&st->mode->mdct, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, B, C);
/* De-emphasis and put everything back at the right place in the synthesis history */
for (c=0;c<C;c++)
{
int j;
for (j=0;j<N;j++)
{
- float tmp = st->out_mem[C*(MAX_PERIOD+(i-B)*N)+C*j+c] + st->preemph*st->preemph_memD[c];
+ celt_sig_t tmp = ADD32(st->out_mem[C*(MAX_PERIOD+(i-B)*N)+C*j+c],
+ MULT16_32_Q15(preemph,st->preemph_memD[c]));
st->preemph_memD[c] = tmp;
- tmp *= SIG_SCALING_1;
- if (tmp > 32767) tmp = 32767;
- if (tmp < -32767) tmp = -32767;
- pcm[C*i*N+C*j+c] = (short)floor(.5+tmp);
+ pcm[C*i*N+C*j+c] = SIG2INT16(tmp);
}
}
}
if (nbBytes > nbCompressedBytes)
{
celt_warning_int ("got too many bytes:", nbBytes);
+ RESTORE_STACK;
return CELT_INTERNAL_ERROR;
}
/*printf ("%d\n", *nbBytes);*/
ec_byte_reset(&st->buf);
ec_enc_init(&st->enc,&st->buf);
+ RESTORE_STACK;
return nbCompressedBytes;
}
ec_byte_buffer buf;
ec_enc enc;
- float preemph;
- float *preemph_memD;
-
- mdct_lookup mdct_lookup;
-
- float *window;
+ celt_sig_t *preemph_memD;
+
celt_sig_t *mdct_overlap;
celt_sig_t *out_mem;
- float *oldBandE;
+ celt_word16_t *oldBandE;
int last_pitch_index;
};
-CELTDecoder *celt_decoder_create(const CELTMode *mode)
+CELTDecoder EXPORT *celt_decoder_create(const CELTMode *mode)
{
- int i, N, B, C, N4;
+ int N, B, C;
CELTDecoder *st;
if (check_mode(mode) != CELT_OK)
st->nb_blocks = B;
st->overlap = mode->overlap;
- N4 = (N-st->overlap)/2;
-
- mdct_init(&st->mdct_lookup, 2*N);
-
- st->window = celt_alloc(2*N*sizeof(float));
st->mdct_overlap = celt_alloc(N*C*sizeof(celt_sig_t));
st->out_mem = celt_alloc(MAX_PERIOD*C*sizeof(celt_sig_t));
-
- for (i=0;i<2*N;i++)
- st->window[i] = 0;
- for (i=0;i<st->overlap;i++)
- st->window[N4+i] = st->window[2*N-N4-i-1]
- = sin(.5*M_PI* sin(.5*M_PI*(i+.5)/st->overlap) * sin(.5*M_PI*(i+.5)/st->overlap));
- for (i=0;i<2*N4;i++)
- st->window[N-N4+i] = 1;
- st->oldBandE = celt_alloc(C*mode->nbEBands*sizeof(float));
+ st->oldBandE = (celt_word16_t*)celt_alloc(C*mode->nbEBands*sizeof(celt_word16_t));
- st->preemph = 0.8;
- st->preemph_memD = celt_alloc(C*sizeof(float));;
+ st->preemph_memD = (celt_sig_t*)celt_alloc(C*sizeof(celt_sig_t));;
st->last_pitch_index = 0;
return st;
}
-void celt_decoder_destroy(CELTDecoder *st)
+void EXPORT celt_decoder_destroy(CELTDecoder *st)
{
if (st == NULL)
{
if (check_mode(st->mode) != CELT_OK)
return;
- mdct_clear(&st->mdct_lookup);
- celt_free(st->window);
celt_free(st->mdct_overlap);
celt_free(st->out_mem);
{
int i, c, N, B, C;
int pitch_index;
- VARDECL(celt_sig_t *freq);
+ VARDECL(celt_sig_t, freq);
+ SAVE_STACK;
N = st->block_size;
B = st->nb_blocks;
C = st->mode->nbChannels;
pitch_index = st->last_pitch_index;
/* Use the pitch MDCT as the "guessed" signal */
- compute_mdcts(&st->mdct_lookup, st->window, st->out_mem+pitch_index*C, freq, N, B, C);
+ compute_mdcts(&st->mode->mdct, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap, B, C);
CELT_MOVE(st->out_mem, st->out_mem+C*B*N, C*(MAX_PERIOD-B*N));
/* Compute inverse MDCTs */
- compute_inv_mdcts(&st->mdct_lookup, st->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, B, C);
+ compute_inv_mdcts(&st->mode->mdct, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, B, C);
for (c=0;c<C;c++)
{
int j;
for (j=0;j<N;j++)
{
- float tmp = st->out_mem[C*(MAX_PERIOD+(i-B)*N)+C*j+c] + st->preemph*st->preemph_memD[c];
+ celt_sig_t tmp = ADD32(st->out_mem[C*(MAX_PERIOD+(i-B)*N)+C*j+c],
+ MULT16_32_Q15(preemph,st->preemph_memD[c]));
st->preemph_memD[c] = tmp;
- tmp *= SIG_SCALING_1;
- if (tmp > 32767) tmp = 32767;
- if (tmp < -32767) tmp = -32767;
- pcm[C*i*N+C*j+c] = (short)floor(.5+tmp);
+ pcm[C*i*N+C*j+c] = SIG2INT16(tmp);
}
}
}
+ RESTORE_STACK;
}
-int celt_decode(CELTDecoder *st, unsigned char *data, int len, celt_int16_t *pcm)
+int EXPORT celt_decode(CELTDecoder *st, unsigned char *data, int len, celt_int16_t *pcm)
{
- int i, c, N, B, C;
+ int i, c, N, B, C, N4;
int has_pitch;
int pitch_index;
ec_dec dec;
ec_byte_buffer buf;
- VARDECL(celt_sig_t *freq);
- VARDECL(celt_norm_t *X);
- VARDECL(celt_norm_t *P);
- VARDECL(celt_ener_t *bandE);
- VARDECL(celt_pgain_t *gains);
+ VARDECL(celt_sig_t, freq);
+ VARDECL(celt_norm_t, X);
+ VARDECL(celt_norm_t, P);
+ VARDECL(celt_ener_t, bandE);
+ VARDECL(celt_pgain_t, gains);
+ SAVE_STACK;
if (check_mode(st->mode) != CELT_OK)
return CELT_INVALID_MODE;
N = st->block_size;
B = st->nb_blocks;
C = st->mode->nbChannels;
-
+ N4 = (N-st->overlap)>>1;
+
ALLOC(freq, C*B*N, celt_sig_t); /**< Interleaved signal MDCTs */
ALLOC(X, C*B*N, celt_norm_t); /**< Interleaved normalised MDCTs */
ALLOC(P, C*B*N, celt_norm_t); /**< Interleaved normalised pitch MDCTs*/
ALLOC(gains, st->mode->nbPBands, celt_pgain_t);
if (check_mode(st->mode) != CELT_OK)
+ {
+ RESTORE_STACK;
return CELT_INVALID_MODE;
+ }
if (data == NULL)
{
celt_decode_lost(st, pcm);
+ RESTORE_STACK;
return 0;
}
/* Get the pitch index */
if (has_pitch)
{
- pitch_index = ec_dec_uint(&dec, MAX_PERIOD-(B+1)*N);
+ pitch_index = ec_dec_uint(&dec, MAX_PERIOD-((B+1)*N-2*N4));
st->last_pitch_index = pitch_index;
} else {
/* FIXME: We could be more intelligent here and just not compute the MDCT */
}
/* Pitch MDCT */
- compute_mdcts(&st->mdct_lookup, st->window, st->out_mem+pitch_index*C, freq, N, B, C);
+ compute_mdcts(&st->mode->mdct, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap, B, C);
{
- VARDECL(celt_ener_t *bandEp);
+ VARDECL(celt_ener_t, bandEp);
ALLOC(bandEp, st->mode->nbEBands*C, celt_ener_t);
compute_band_energies(st->mode, freq, bandEp);
normalise_bands(st->mode, freq, P, bandEp);
stereo_mix(st->mode, P, bandE, 1);
/* Apply pitch gains */
- pitch_quant_bands(st->mode, X, P, gains);
+ pitch_quant_bands(st->mode, P, gains);
/* Decode fixed codebook and merge with pitch */
unquant_bands(st->mode, X, P, len*8, &dec);
CELT_MOVE(st->out_mem, st->out_mem+C*B*N, C*(MAX_PERIOD-B*N));
/* Compute inverse MDCTs */
- compute_inv_mdcts(&st->mdct_lookup, st->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, B, C);
+ compute_inv_mdcts(&st->mode->mdct, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, B, C);
for (c=0;c<C;c++)
{
int j;
for (j=0;j<N;j++)
{
- float tmp = st->out_mem[C*(MAX_PERIOD+(i-B)*N)+C*j+c] + st->preemph*st->preemph_memD[c];
+ celt_sig_t tmp = ADD32(st->out_mem[C*(MAX_PERIOD+(i-B)*N)+C*j+c],
+ MULT16_32_Q15(preemph,st->preemph_memD[c]));
st->preemph_memD[c] = tmp;
- tmp *= SIG_SCALING_1;
- if (tmp > 32767) tmp = 32767;
- if (tmp < -32767) tmp = -32767;
- pcm[C*i*N+C*j+c] = (short)floor(.5+tmp);
+ pcm[C*i*N+C*j+c] = SIG2INT16(tmp);
}
}
}
{
- int val = 0;
+ unsigned int val = 0;
while (ec_dec_tell(&dec, 0) < len*8)
{
if (ec_dec_uint(&dec, 2) != val)
{
celt_warning("decode error");
+ RESTORE_STACK;
return CELT_CORRUPTED_DATA;
}
val = 1-val;
}
}
+ RESTORE_STACK;
return 0;
/*printf ("\n");*/
}
xiph / opus.git / blobdiff