Note some more platforms where float-approx is tested, fix a bug in the prediction...
[opus.git] / libcelt / celt.c
index 5db641d..5d32fdc 100644 (file)
@@ -1,5 +1,5 @@
 /* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+   (C) 2008 Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
 #include "bands.h"
 #include "modes.h"
 #include "entcode.h"
-#include "quant_pitch.h"
 #include "quant_bands.h"
 #include "psy.h"
 #include "rate.h"
 #include "stack_alloc.h"
 #include "mathops.h"
+#include "float_cast.h"
+#include <stdarg.h>
 
 static const celt_word16_t preemph = QCONST16(0.8f,15);
 
@@ -59,24 +60,37 @@ static const celt_word16_t transientWindow[16] = {
    17896, 20868, 23687, 26258, 28492, 30314, 31662, 32489};
 #else
 static const float transientWindow[16] = {
-   0.0085135, 0.0337639, 0.0748914, 0.1304955, 0.1986827, 0.2771308, 0.3631685, 0.4538658,
-   0.5461342, 0.6368315, 0.7228692, 0.8013173, 0.8695045, 0.9251086, 0.9662361, 0.9914865};
+   0.0085135, 0.0337639, 0.0748914, 0.1304955, 
+   0.1986827, 0.2771308, 0.3631685, 0.4538658,
+   0.5461342, 0.6368315, 0.7228692, 0.8013173, 
+   0.8695045, 0.9251086, 0.9662361, 0.9914865};
 #endif
 
+#define ENCODERVALID   0x4c434554
+#define ENCODERPARTIAL 0x5445434c
+#define ENCODERFREED   0x4c004500
+   
 /** Encoder state 
  @brief Encoder state
  */
 struct CELTEncoder {
+   celt_uint32_t marker;
    const CELTMode *mode;     /**< Mode used by the encoder */
    int frame_size;
    int block_size;
    int overlap;
    int channels;
    
-   ec_byte_buffer buf;
-   ec_enc         enc;
-
-   celt_word16_t * restrict preemph_memE; /* Input is 16-bit, so why bother with 32 */
+   int pitch_enabled;       /* Complexity level is allowed to use pitch */
+   int pitch_permitted;     /*  Use of the LTP is permitted by the user */
+   int pitch_available;     /*  Amount of pitch buffer available */
+   int force_intra;
+   int delayedIntra;
+   celt_word16_t tonal_average;
+   int fold_decision;
+
+   int VBR_rate; /* Target number of 16th bits per frame */
+   celt_word16_t * restrict preemph_memE; 
    celt_sig_t    * restrict preemph_memD;
 
    celt_sig_t *in_mem;
@@ -89,6 +103,22 @@ struct CELTEncoder {
 #endif
 };
 
+int check_encoder(const CELTEncoder *st) 
+{
+   if (st==NULL)
+   {
+      celt_warning("NULL passed as an encoder structure");  
+      return CELT_INVALID_STATE;
+   }
+   if (st->marker == ENCODERVALID)
+      return CELT_OK;
+   if (st->marker == ENCODERFREED)
+      celt_warning("Referencing an encoder that has already been freed");
+   else
+      celt_warning("This is not a valid CELT encoder structure");
+   return CELT_INVALID_STATE;
+}
+
 CELTEncoder *celt_encoder_create(const CELTMode *mode)
 {
    int N, C;
@@ -101,28 +131,48 @@ CELTEncoder *celt_encoder_create(const CELTMode *mode)
    C = mode->nbChannels;
    st = celt_alloc(sizeof(CELTEncoder));
    
+   if (st==NULL) 
+      return NULL;   
+   st->marker = ENCODERPARTIAL;
    st->mode = mode;
    st->frame_size = N;
    st->block_size = N;
    st->overlap = mode->overlap;
 
-   ec_byte_writeinit(&st->buf);
-   ec_enc_init(&st->enc,&st->buf);
+   st->VBR_rate = 0;
+   st->pitch_enabled = 1;
+   st->pitch_permitted = 1;
+   st->pitch_available = 1;
+   st->force_intra  = 0;
+   st->delayedIntra = 1;
+   st->tonal_average = QCONST16(1.,8);
+   st->fold_decision = 1;
 
    st->in_mem = celt_alloc(st->overlap*C*sizeof(celt_sig_t));
    st->out_mem = celt_alloc((MAX_PERIOD+st->overlap)*C*sizeof(celt_sig_t));
 
    st->oldBandE = (celt_word16_t*)celt_alloc(C*mode->nbEBands*sizeof(celt_word16_t));
 
-   st->preemph_memE = (celt_word16_t*)celt_alloc(C*sizeof(celt_word16_t));;
-   st->preemph_memD = (celt_sig_t*)celt_alloc(C*sizeof(celt_sig_t));;
+   st->preemph_memE = (celt_word16_t*)celt_alloc(C*sizeof(celt_word16_t));
+   st->preemph_memD = (celt_sig_t*)celt_alloc(C*sizeof(celt_sig_t));
 
 #ifdef EXP_PSY
    st->psy_mem = celt_alloc(MAX_PERIOD*sizeof(celt_word16_t));
    psydecay_init(&st->psy, MAX_PERIOD/2, st->mode->Fs);
 #endif
 
-   return st;
+   if ((st->in_mem!=NULL) && (st->out_mem!=NULL) && (st->oldBandE!=NULL) 
+#ifdef EXP_PSY
+       && (st->psy_mem!=NULL) 
+#endif   
+       && (st->preemph_memE!=NULL) && (st->preemph_memD!=NULL))
+   {
+      st->marker   = ENCODERVALID;
+      return st;
+   }
+   /* If the setup fails for some reason deallocate it. */
+   celt_encoder_destroy(st);  
+   return NULL;
 }
 
 void celt_encoder_destroy(CELTEncoder *st)
@@ -132,11 +182,23 @@ void celt_encoder_destroy(CELTEncoder *st)
       celt_warning("NULL passed to celt_encoder_destroy");
       return;
    }
-   if (check_mode(st->mode) != CELT_OK)
-      return;
 
-   ec_byte_writeclear(&st->buf);
+   if (st->marker == ENCODERFREED)
+   {
+      celt_warning("Freeing an encoder which has already been freed"); 
+      return;
+   }
 
+   if (st->marker != ENCODERVALID && st->marker != ENCODERPARTIAL)
+   {
+      celt_warning("This is not a valid CELT encoder structure");
+      return;
+   }
+   /*Check_mode is non-fatal here because we can still free
+    the encoder memory even if the mode is bad, although calling
+    the free functions in this order is a violation of the API.*/
+   check_mode(st->mode);
+   
    celt_free(st->in_mem);
    celt_free(st->out_mem);
    
@@ -149,71 +211,81 @@ void celt_encoder_destroy(CELTEncoder *st)
    celt_free (st->psy_mem);
    psydecay_clear(&st->psy);
 #endif
+   st->marker = ENCODERFREED;
    
    celt_free(st);
 }
 
-static inline celt_int16_t SIG2INT16(celt_sig_t x)
+static inline celt_int16_t FLOAT2INT16(float x)
 {
-   x = PSHR32(x, SIG_SHIFT);
+   x = x*CELT_SIG_SCALE;
    x = MAX32(x, -32768);
    x = MIN32(x, 32767);
+   return (celt_int16_t)float2int(x);
+}
+
+static inline celt_word16_t SIG2WORD16(celt_sig_t x)
+{
 #ifdef FIXED_POINT
+   x = PSHR32(x, SIG_SHIFT);
+   x = MAX32(x, -32768);
+   x = MIN32(x, 32767);
    return EXTRACT16(x);
 #else
-   return (celt_int16_t)floor(.5+x);
+   return (celt_word16_t)x;
 #endif
 }
 
-static int transient_analysis(celt_word32_t *in, int len, int C, celt_word32_t *r)
+static int transient_analysis(celt_word32_t *in, int len, int C, int *transient_time, int *transient_shift)
 {
    int c, i, n;
    celt_word32_t ratio;
    /* FIXME: Remove the floats here */
-   float maxN, maxD;
    VARDECL(celt_word32_t, begin);
    SAVE_STACK;
    ALLOC(begin, len, celt_word32_t);
-   
    for (i=0;i<len;i++)
-      begin[i] = EXTEND32(ABS16(SHR32(in[C*i],SIG_SHIFT)));
+      begin[i] = ABS32(SHR32(in[C*i],SIG_SHIFT));
    for (c=1;c<C;c++)
    {
       for (i=0;i<len;i++)
-         begin[i] = ADD32(begin[i], EXTEND32(ABS16(SHR32(in[C*i+c],SIG_SHIFT))));
+         begin[i] = MAX32(begin[i], ABS32(SHR32(in[C*i+c],SIG_SHIFT)));
    }
    for (i=1;i<len;i++)
-      begin[i] = begin[i-1]+begin[i];
-
-   maxD = VERY_LARGE32;
-   maxN = 0;
+      begin[i] = MAX32(begin[i-1],begin[i]);
    n = -1;
    for (i=8;i<len-8;i++)
    {
-      celt_word32_t endi;
-      celt_word32_t num, den;
-      endi = begin[len-1]-begin[i];
-      num = endi*i;
-      den = (30+begin[i])*(len-i)+MULT16_32_Q15(QCONST16(.1f,15),endi)*len;
-      if ((num*maxD > den*maxN) && (endi > MULT16_32_Q15(QCONST16(.05f,15),begin[i])))
-      {
-         maxN = num;
-         maxD = den;
-         n = i;
-      }
+      if (begin[i] < MULT16_32_Q15(QCONST16(.2f,15),begin[len-1]))
+         n=i;
    }
-   ratio = DIV32((begin[len-1]-begin[n])*n,(10+begin[n])*(len-n));
    if (n<32)
    {
       n = -1;
       ratio = 0;
+   } else {
+      ratio = DIV32(begin[len-1],1+begin[n-16]);
    }
-   *r = ratio*ratio;
+   /*printf ("%d %f\n", n, ratio*ratio);*/
+   if (ratio < 0)
+      ratio = 0;
+   if (ratio > 1000)
+      ratio = 1000;
+   ratio *= ratio;
+   
+   if (ratio > 2048)
+      *transient_shift = 3;
+   else
+      *transient_shift = 0;
+   
+   *transient_time = n;
+   
    RESTORE_STACK;
-   return n;
+   return ratio > 20;
 }
 
-/** Apply window and compute the MDCT for all sub-frames and all channels in a frame */
+/** Apply window and compute the MDCT for all sub-frames and 
+    all channels in a frame */
 static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t * restrict in, celt_sig_t * restrict out)
 {
    const int C = CHANNELS(mode);
@@ -240,12 +312,12 @@ static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t * re
          mdct_forward(lookup, x, tmp, mode->window, overlap);
          /* Interleaving the sub-frames */
          for (j=0;j<N;j++)
-            out[C*j+c] = tmp[j];
+            out[j+c*N] = tmp[j];
       }
       RESTORE_STACK;
    } else {
       const mdct_lookup *lookup = &mode->shortMdct;
-      const int overlap = mode->shortMdctSize;
+      const int overlap = mode->overlap;
       const int N = mode->shortMdctSize;
       int b, c;
       VARDECL(celt_word32_t, x);
@@ -264,14 +336,15 @@ static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t * re
             mdct_forward(lookup, x, tmp, mode->window, overlap);
             /* Interleaving the sub-frames */
             for (j=0;j<N;j++)
-               out[C*(j*B+b)+c] = tmp[j];
+               out[(j*B+b)+c*N*B] = tmp[j];
          }
       }
       RESTORE_STACK;
    }
 }
 
-/** Compute the IMDCT and apply window for all sub-frames and all channels in a frame */
+/** Compute the IMDCT and apply window for all sub-frames and 
+    all channels in a frame */
 static void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t *X, int transient_time, int transient_shift, celt_sig_t * restrict out_mem)
 {
    int c, N4;
@@ -294,9 +367,9 @@ static void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t
          ALLOC(tmp, N, celt_word32_t);
          /* De-interleaving the sub-frames */
          for (j=0;j<N;j++)
-            tmp[j] = X[C*j+c];
+            tmp[j] = X[j+c*N];
          /* Prevents problems from the imdct doing the overlap-add */
-         CELT_MEMSET(x+N4, 0, overlap);
+         CELT_MEMSET(x+N4, 0, N);
          mdct_backward(lookup, tmp, x, mode->window, overlap);
          celt_assert(transient_shift == 0);
          /* The first and last part would need to be set to zero if we actually
@@ -319,12 +392,12 @@ static void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t
          ALLOC(x, 2*N, celt_word32_t);
          ALLOC(tmp, N, celt_word32_t);
          /* Prevents problems from the imdct doing the overlap-add */
-         CELT_MEMSET(x+N4, 0, overlap);
+         CELT_MEMSET(x+N4, 0, N2);
          for (b=0;b<B;b++)
          {
             /* De-interleaving the sub-frames */
             for (j=0;j<N2;j++)
-               tmp[j] = X[C*(j*B+b)+c];
+               tmp[j] = X[(j*B+b)+c*N2*B];
             mdct_backward(lookup, tmp, x+N4+N2*b, mode->window, overlap);
          }
          if (transient_shift > 0)
@@ -341,8 +414,8 @@ static void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t
                x[N4+j] *= 1<<transient_shift;
 #endif
          }
-         /* The first and last part would need to be set to zero if we actually
-         wanted to use them. */
+         /* 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++)
             out_mem[C*(MAX_PERIOD-N)+C*j+c] += x[j+N4];
          for (j=0;j<overlap;j++)
@@ -354,32 +427,125 @@ static void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t
    }
 }
 
-int celt_encode(CELTEncoder * restrict st, celt_int16_t * restrict pcm, unsigned char *compressed, int nbCompressedBytes)
+#define FLAG_NONE        0
+#define FLAG_INTRA       1U<<16
+#define FLAG_PITCH       1U<<15
+#define FLAG_SHORT       1U<<14
+#define FLAG_FOLD        1U<<13
+#define FLAG_MASK        (FLAG_INTRA|FLAG_PITCH|FLAG_SHORT|FLAG_FOLD)
+
+celt_int32_t flaglist[8] = {
+      0 /*00  */ | FLAG_FOLD,
+      1 /*01  */ | FLAG_PITCH|FLAG_FOLD,
+      8 /*1000*/ | FLAG_NONE,
+      9 /*1001*/ | FLAG_SHORT|FLAG_FOLD,
+     10 /*1010*/ | FLAG_PITCH,
+     11 /*1011*/ | FLAG_INTRA,
+      6 /*110 */ | FLAG_INTRA|FLAG_FOLD,
+      7 /*111 */ | FLAG_INTRA|FLAG_SHORT|FLAG_FOLD
+};
+
+void encode_flags(ec_enc *enc, int intra_ener, int has_pitch, int shortBlocks, int has_fold)
 {
+   int i;
+   int flags=FLAG_NONE;
+   int flag_bits;
+   flags |= intra_ener   ? FLAG_INTRA : 0;
+   flags |= has_pitch    ? FLAG_PITCH : 0;
+   flags |= shortBlocks  ? FLAG_SHORT : 0;
+   flags |= has_fold     ? FLAG_FOLD  : 0;
+   for (i=0;i<8;i++)
+      if (flags == (flaglist[i]&FLAG_MASK))
+         break;
+   celt_assert(i<8);
+   flag_bits = flaglist[i]&0xf;
+   /*printf ("enc %d: %d %d %d %d\n", flag_bits, intra_ener, has_pitch, shortBlocks, has_fold);*/
+   if (i<2)
+      ec_enc_bits(enc, flag_bits, 2);
+   else if (i<6)
+      ec_enc_bits(enc, flag_bits, 4);
+   else
+      ec_enc_bits(enc, flag_bits, 3);
+}
+
+void decode_flags(ec_dec *dec, int *intra_ener, int *has_pitch, int *shortBlocks, int *has_fold)
+{
+   int i;
+   int flag_bits;
+   flag_bits = ec_dec_bits(dec, 2);
+   /*printf ("(%d) ", flag_bits);*/
+   if (flag_bits==2)
+      flag_bits = (flag_bits<<2) | ec_dec_bits(dec, 2);
+   else if (flag_bits==3)
+      flag_bits = (flag_bits<<1) | ec_dec_bits(dec, 1);
+   for (i=0;i<8;i++)
+      if (flag_bits == (flaglist[i]&0xf))
+         break;
+   celt_assert(i<8);
+   *intra_ener  = (flaglist[i]&FLAG_INTRA) != 0;
+   *has_pitch   = (flaglist[i]&FLAG_PITCH) != 0;
+   *shortBlocks = (flaglist[i]&FLAG_SHORT) != 0;
+   *has_fold    = (flaglist[i]&FLAG_FOLD ) != 0;
+   /*printf ("dec %d: %d %d %d %d\n", flag_bits, *intra_ener, *has_pitch, *shortBlocks, *has_fold);*/
+}
+
+#ifdef FIXED_POINT
+int celt_encode(CELTEncoder * restrict st, const celt_int16_t * pcm, celt_int16_t * optional_synthesis, unsigned char *compressed, int nbCompressedBytes)
+{
+#else
+int celt_encode_float(CELTEncoder * restrict st, const celt_sig_t * pcm, celt_sig_t * optional_synthesis, unsigned char *compressed, int nbCompressedBytes)
+{
+#endif
    int i, c, N, N4;
    int has_pitch;
    int pitch_index;
-   celt_word32_t curr_power, pitch_power;
+   int bits;
+   int has_fold=1;
+   unsigned coarse_needed;
+   ec_byte_buffer buf;
+   ec_enc         enc;
    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_word16_t, bandLogE);
    VARDECL(celt_pgain_t, gains);
-   VARDECL(int, stereo_mode);
+   VARDECL(int, fine_quant);
+   VARDECL(celt_word16_t, error);
+   VARDECL(int, pulses);
+   VARDECL(int, offsets);
+   VARDECL(int, fine_priority);
 #ifdef EXP_PSY
    VARDECL(celt_word32_t, mask);
+   VARDECL(celt_word32_t, tonality);
+   VARDECL(celt_word32_t, bandM);
+   VARDECL(celt_ener_t, bandN);
 #endif
+   int intra_ener = 0;
    int shortBlocks=0;
    int transient_time;
    int transient_shift;
-   celt_word32_t maxR;
    const int C = CHANNELS(st->mode);
+   int mdct_weight_shift = 0;
+   int mdct_weight_pos=0;
    SAVE_STACK;
 
+   if (check_encoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
    if (check_mode(st->mode) != CELT_OK)
       return CELT_INVALID_MODE;
 
+   if (nbCompressedBytes<0)
+     return CELT_BAD_ARG; 
+
+   /* The memset is important for now in case the encoder doesn't 
+      fill up all the bytes */
+   CELT_MEMSET(compressed, 0, nbCompressedBytes);
+   ec_byte_writeinit_buffer(&buf, compressed, nbCompressedBytes);
+   ec_enc_init(&enc,&buf);
+
    N = st->block_size;
    N4 = (N-st->overlap)>>1;
    ALLOC(in, 2*C*N-2*C*N4, celt_sig_t);
@@ -387,43 +553,31 @@ int celt_encode(CELTEncoder * restrict st, celt_int16_t * restrict pcm, unsigned
    CELT_COPY(in, st->in_mem, C*st->overlap);
    for (c=0;c<C;c++)
    {
-      const celt_int16_t * restrict pcmp = pcm+c;
+      const celt_word16_t * restrict pcmp = pcm+c;
       celt_sig_t * restrict inp = in+C*st->overlap+c;
       for (i=0;i<N;i++)
       {
          /* Apply pre-emphasis */
-         celt_sig_t tmp = SHL32(EXTEND32(*pcmp), SIG_SHIFT);
-         *inp = SUB32(tmp, SHR32(MULT16_16(preemph,st->preemph_memE[c]),1));
-         st->preemph_memE[c] = *pcmp;
+         celt_sig_t tmp = SCALEIN(SHL32(EXTEND32(*pcmp), SIG_SHIFT));
+         *inp = SUB32(tmp, SHR32(MULT16_16(preemph,st->preemph_memE[c]),3));
+         st->preemph_memE[c] = SCALEIN(*pcmp);
          inp += C;
          pcmp += C;
       }
    }
    CELT_COPY(st->in_mem, in+C*(2*N-2*N4-st->overlap), C*st->overlap);
-   
-   transient_time = transient_analysis(in, N+st->overlap, C, &maxR);
-   if (maxR > 30)
+
+   /* Transient handling */
+   transient_time = -1;
+   transient_shift = 0;
+   shortBlocks = 0;
+
+   if (st->mode->nbShortMdcts > 1 && transient_analysis(in, N+st->overlap, C, &transient_time, &transient_shift))
    {
 #ifndef FIXED_POINT
       float gain_1;
 #endif
-      ec_enc_bits(&st->enc, 1, 1);
-      if (maxR < 30)
-      {
-         transient_shift = 0;
-      } else if (maxR < 100)
-      {
-         transient_shift = 1;
-      } else if (maxR < 500)
-      {
-         transient_shift = 2;
-      } else
-      {
-         transient_shift = 3;
-      }
-      ec_enc_bits(&st->enc, transient_shift, 2);
-      if (transient_shift)
-         ec_enc_uint(&st->enc, transient_time, N+st->overlap);
+      /* Apply the inverse shaping window */
       if (transient_shift)
       {
 #ifdef FIXED_POINT
@@ -444,182 +598,497 @@ int celt_encode(CELTEncoder * restrict st, celt_int16_t * restrict pcm, unsigned
 #endif
       }
       shortBlocks = 1;
-   } else {
-      ec_enc_bits(&st->enc, 0, 1);
-      transient_time = -1;
-      transient_shift = 0;
-      shortBlocks = 0;
+      has_fold = 1;
    }
-   /* Pitch analysis: we do it early to save on the peak stack space */
-   if (!shortBlocks)
-      find_spectral_pitch(st->mode, st->mode->fft, &st->mode->psy, in, st->out_mem, st->mode->window, 2*N-2*N4, MAX_PERIOD-(2*N-2*N4), &pitch_index);
 
    ALLOC(freq, 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");*/
+   ALLOC(bandE,st->mode->nbEBands*C, celt_ener_t);
+   ALLOC(bandLogE,st->mode->nbEBands*C, celt_word16_t);
    /* Compute MDCTs */
    compute_mdcts(st->mode, shortBlocks, in, freq);
 
+   if (shortBlocks && !transient_shift) 
+   {
+      celt_word32_t sum[4]={1,1,1,1};
+      int m;
+      for (c=0;c<C;c++)
+      {
+         m=0;
+         do {
+            celt_word32_t tmp=0;
+            for (i=m+c*N;i<(c+1)*N;i+=st->mode->nbShortMdcts)
+               tmp += ABS32(freq[i]);
+            sum[m++] += tmp;
+         } while (m<st->mode->nbShortMdcts);
+      }
+      m=0;
+#ifdef FIXED_POINT
+      do {
+         if (SHR32(sum[m+1],3) > sum[m])
+         {
+            mdct_weight_shift=2;
+            mdct_weight_pos = m;
+         } else if (SHR32(sum[m+1],1) > sum[m] && mdct_weight_shift < 2)
+         {
+            mdct_weight_shift=1;
+            mdct_weight_pos = m;
+         }
+         m++;
+      } while (m<st->mode->nbShortMdcts-1);
+      if (mdct_weight_shift)
+      {
+         for (c=0;c<C;c++)
+            for (m=mdct_weight_pos+1;m<st->mode->nbShortMdcts;m++)
+               for (i=m+c*N;i<(c+1)*N;i+=st->mode->nbShortMdcts)
+                  freq[i] = SHR32(freq[i],mdct_weight_shift);
+      }
+#else
+      do {
+         if (sum[m+1] > 8*sum[m])
+         {
+            mdct_weight_shift=2;
+            mdct_weight_pos = m;
+         } else if (sum[m+1] > 2*sum[m] && mdct_weight_shift < 2)
+         {
+            mdct_weight_shift=1;
+            mdct_weight_pos = m;
+         }
+         m++;
+      } while (m<st->mode->nbShortMdcts-1);
+      if (mdct_weight_shift)
+      {
+         for (c=0;c<C;c++)
+            for (m=mdct_weight_pos+1;m<st->mode->nbShortMdcts;m++)
+               for (i=m+c*N;i<(c+1)*N;i+=st->mode->nbShortMdcts)
+                  freq[i] = (1./(1<<mdct_weight_shift))*freq[i];
+      }
+#endif
+   }
+
+   compute_band_energies(st->mode, freq, bandE);
+   for (i=0;i<st->mode->nbEBands*C;i++)
+      bandLogE[i] = amp2Log(bandE[i]);
+
+   /* Don't use intra energy when we're operating at low bit-rate */
+   intra_ener = st->force_intra || (st->delayedIntra && nbCompressedBytes > st->mode->nbEBands);
+   if (shortBlocks || intra_decision(bandLogE, st->oldBandE, st->mode->nbEBands))
+      st->delayedIntra = 1;
+   else
+      st->delayedIntra = 0;
+
+   /* Pitch analysis: we do it early to save on the peak stack space */
+   /* Don't use pitch if there isn't enough data available yet, 
+      or if we're using shortBlocks */
+   has_pitch = st->pitch_enabled && st->pitch_permitted && (st->pitch_available >= MAX_PERIOD) && (!shortBlocks) && !intra_ener;
 #ifdef EXP_PSY
-   CELT_MOVE(st->psy_mem, st->out_mem+N, MAX_PERIOD+st->overlap-N);
-   for (i=0;i<N;i++)
-      st->psy_mem[MAX_PERIOD+st->overlap-N+i] = in[C*(st->overlap+i)];
-   for (c=1;c<C;c++)
-      for (i=0;i<N;i++)
-         st->psy_mem[MAX_PERIOD+st->overlap-N+i] += in[C*(st->overlap+i)+c];
+   ALLOC(tonality, MAX_PERIOD/4, celt_word16_t);
+   {
+      VARDECL(celt_word16_t, X);
+      ALLOC(X, MAX_PERIOD/2, celt_word16_t);
+      find_spectral_pitch(st->mode, st->mode->fft, &st->mode->psy, in, st->out_mem, st->mode->window, X, 2*N-2*N4, MAX_PERIOD-(2*N-2*N4), &pitch_index);
+      compute_tonality(st->mode, X, st->psy_mem, MAX_PERIOD, tonality, MAX_PERIOD/4);
+   }
+#else
+   if (has_pitch)
+   {
+      find_spectral_pitch(st->mode, st->mode->fft, &st->mode->psy, in, st->out_mem, st->mode->window, NULL, 2*N-2*N4, MAX_PERIOD-(2*N-2*N4), &pitch_index);
+   }
+#endif
 
+#ifdef EXP_PSY
    ALLOC(mask, N, celt_sig_t);
-   compute_mdct_masking(&st->psy, freq, st->psy_mem, mask, C*N);
-
-   /* Invert and stretch the mask to length of X 
-      For some reason, I get better results by using the sqrt instead,
-      although there's no valid reason to. Must investigate further */
-   for (i=0;i<C*N;i++)
-      mask[i] = 1/(.1+mask[i]);
+   compute_mdct_masking(&st->psy, freq, tonality, st->psy_mem, mask, C*N);
+   /*for (i=0;i<256;i++)
+      printf ("%f %f %f ", freq[i], tonality[i], mask[i]);
+   printf ("\n");*/
 #endif
-   
-   /* Deferred allocation after find_spectral_pitch() to reduce the peak memory usage */
+
+   /* Deferred allocation after find_spectral_pitch() to reduce 
+      the peak memory usage */
    ALLOC(X, C*N, celt_norm_t);         /**< Interleaved normalised MDCTs */
    ALLOC(P, 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++)
-      printf ("%f ", X[j]);
-   for (j=0;j<B*N;j++)
-      printf ("%f ", P[j]);
-   printf ("\n");*/
 
    /* Band normalisation */
-   compute_band_energies(st->mode, freq, bandE);
    normalise_bands(st->mode, freq, X, bandE);
-   /*for (i=0;i<st->mode->nbEBands;i++)printf("%f ", bandE[i]);printf("\n");*/
-   /*for (i=0;i<N*B*C;i++)printf("%f ", X[i]);printf("\n");*/
+   if (!shortBlocks && !folding_decision(st->mode, X, &st->tonal_average, &st->fold_decision))
+      has_fold = 0;
+#ifdef EXP_PSY
+   ALLOC(bandN,C*st->mode->nbEBands, celt_ener_t);
+   ALLOC(bandM,st->mode->nbEBands, celt_ener_t);
+   compute_noise_energies(st->mode, freq, tonality, bandN);
 
-   /* Compute MDCTs of the pitch part */
-   if (!shortBlocks)
-      compute_mdcts(st->mode, 0, st->out_mem+pitch_index*C, freq);
+   /*for (i=0;i<st->mode->nbEBands;i++)
+      printf ("%f ", (.1+bandN[i])/(.1+bandE[i]));
+   printf ("\n");*/
+   has_fold = 0;
+   for (i=st->mode->nbPBands;i<st->mode->nbEBands;i++)
+      if (bandN[i] < .4*bandE[i])
+         has_fold++;
+   /*printf ("%d\n", has_fold);*/
+   if (has_fold>=2)
+      has_fold = 0;
+   else
+      has_fold = 1;
+   for (i=0;i<N;i++)
+      mask[i] = sqrt(mask[i]);
+   compute_band_energies(st->mode, mask, bandM);
+   /*for (i=0;i<st->mode->nbEBands;i++)
+      printf ("%f %f ", bandE[i], bandM[i]);
+   printf ("\n");*/
+#endif
 
+   /* Compute MDCTs of the pitch part */
+   if (has_pitch)
    {
+      celt_word32_t curr_power, pitch_power=0;
       /* Normalise the pitch vector as well (discard the energies) */
       VARDECL(celt_ener_t, bandEp);
+      
+      compute_mdcts(st->mode, 0, st->out_mem+pitch_index*C, freq);
       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);
       pitch_power = bandEp[0]+bandEp[1]+bandEp[2];
+      curr_power = bandE[0]+bandE[1]+bandE[2];
+      if (C>1)
+      {
+         pitch_power += bandEp[0+st->mode->nbEBands]+bandEp[1+st->mode->nbEBands]+bandEp[2+st->mode->nbEBands];
+         curr_power += bandE[0+st->mode->nbEBands]+bandE[1+st->mode->nbEBands]+bandE[2+st->mode->nbEBands];
+      }
+      /* Check if we can safely use the pitch (i.e. effective gain 
+      isn't too high) */
+      if ((MULT16_32_Q15(QCONST16(.1f, 15),curr_power) + QCONST32(10.f,ENER_SHIFT) < pitch_power))
+      {
+         /* Pitch prediction */
+         has_pitch = compute_pitch_gain(st->mode, X, P, gains);
+      } else {
+         has_pitch = 0;
+      }
    }
-   curr_power = bandE[0]+bandE[1]+bandE[2];
-   /* Check if we can safely use the pitch (i.e. effective gain isn't too high) */
-   if (!shortBlocks && (MULT16_32_Q15(QCONST16(.1f, 15),curr_power) + QCONST32(10.f,ENER_SHIFT) < pitch_power))
+   
+   encode_flags(&enc, intra_ener, has_pitch, shortBlocks, has_fold);
+   if (has_pitch)
    {
-      /* Simulates intensity stereo */
-      /*for (i=30;i<N*B;i++)
-         X[i*C+1] = P[i*C+1] = 0;*/
-
-      /* Pitch prediction */
-      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-(2*N-2*N4));
+      ec_enc_uint(&enc, pitch_index, MAX_PERIOD-(2*N-2*N4));
    } else {
-      /* No pitch, so we just pretend we found a gain of zero */
       for (i=0;i<st->mode->nbPBands;i++)
          gains[i] = 0;
-      ec_enc_bits(&st->enc, 0, 7);
       for (i=0;i<C*N;i++)
          P[i] = 0;
    }
-   quant_energy(st->mode, bandE, st->oldBandE, 20*C+nbCompressedBytes*8/5, st->mode->prob, &st->enc);
-
-   ALLOC(stereo_mode, st->mode->nbEBands, int);
-   stereo_decision(st->mode, X, stereo_mode, st->mode->nbEBands);
+   if (shortBlocks)
+   {
+      if (transient_shift)
+      {
+         ec_enc_bits(&enc, transient_shift, 2);
+         ec_enc_uint(&enc, transient_time, N+st->overlap);
+      } else {
+         ec_enc_bits(&enc, mdct_weight_shift, 2);
+         if (mdct_weight_shift && st->mode->nbShortMdcts!=2)
+            ec_enc_uint(&enc, mdct_weight_pos, st->mode->nbShortMdcts-1);
+      }
+   }
 
-   pitch_quant_bands(st->mode, P, gains);
+#ifdef STDIN_TUNING2
+   static int fine_quant[30];
+   static int pulses[30];
+   static int init=0;
+   if (!init)
+   {
+      for (i=0;i<st->mode->nbEBands;i++)
+         scanf("%d ", &fine_quant[i]);
+      for (i=0;i<st->mode->nbEBands;i++)
+         scanf("%d ", &pulses[i]);
+      init = 1;
+   }
+#else
+   ALLOC(fine_quant, st->mode->nbEBands, int);
+   ALLOC(pulses, st->mode->nbEBands, int);
+#endif
 
-   /*for (i=0;i<B*N;i++) printf("%f ",P[i]);printf("\n");*/
+   /* Bit allocation */
+   ALLOC(error, C*st->mode->nbEBands, celt_word16_t);
+   coarse_needed = quant_coarse_energy(st->mode, bandLogE, st->oldBandE, nbCompressedBytes*8/3, intra_ener, st->mode->prob, error, &enc);
+   coarse_needed = ((coarse_needed*3-1)>>3)+1;
 
-   /* Residual quantisation */
-   quant_bands(st->mode, X, P, NULL, bandE, stereo_mode, nbCompressedBytes*8, shortBlocks, &st->enc);
-   
-   if (C==2)
+   /* Variable bitrate */
+   if (st->VBR_rate>0)
    {
-      renormalise_bands(st->mode, X);
+     /* The target rate in 16th bits per frame */
+     int target=st->VBR_rate;
+   
+     /* Shortblocks get a large boost in bitrate, but since they 
+        are uncommon long blocks are not greatly effected */
+     if (shortBlocks)
+       target*=2;
+     else if (st->mode->nbShortMdcts > 1)
+       target-=(target+14)/28;     
+
+     /* The average energy is removed from the target and the actual 
+        energy added*/
+     target=target-588+ec_enc_tell(&enc, 4);
+
+     /* In VBR mode the frame size must not be reduced so much that it would result in the coarse energy busting its budget */
+     target=IMAX(coarse_needed,(target+64)/128);
+     nbCompressedBytes=IMIN(nbCompressedBytes,target);
    }
-   /* Synthesis */
-   denormalise_bands(st->mode, X, freq, bandE);
 
+   ALLOC(offsets, st->mode->nbEBands, int);
+   ALLOC(fine_priority, st->mode->nbEBands, int);
 
-   CELT_MOVE(st->out_mem, st->out_mem+C*N, C*(MAX_PERIOD+st->overlap-N));
+   for (i=0;i<st->mode->nbEBands;i++)
+      offsets[i] = 0;
+   bits = nbCompressedBytes*8 - ec_enc_tell(&enc, 0) - 1;
+   if (has_pitch)
+      bits -= st->mode->nbPBands;
+#ifndef STDIN_TUNING
+   compute_allocation(st->mode, offsets, bits, pulses, fine_quant, fine_priority);
+#endif
 
-   compute_inv_mdcts(st->mode, shortBlocks, freq, transient_time, transient_shift, st->out_mem);
-   /* De-emphasis and put everything back at the right place in the synthesis history */
-#ifndef SHORTCUTS
-   for (c=0;c<C;c++)
+   quant_fine_energy(st->mode, bandE, st->oldBandE, error, fine_quant, &enc);
+
+   /* Residual quantisation */
+   if (C==1)
+      quant_bands(st->mode, X, P, NULL, has_pitch, gains, bandE, pulses, shortBlocks, has_fold, nbCompressedBytes*8, &enc);
+#ifndef DISABLE_STEREO
+   else
+      quant_bands_stereo(st->mode, X, P, NULL, has_pitch, gains, bandE, pulses, shortBlocks, has_fold, nbCompressedBytes*8, &enc);
+#endif
+
+   quant_energy_finalise(st->mode, bandE, st->oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-ec_enc_tell(&enc, 0), &enc);
+
+   /* Re-synthesis of the coded audio if required */
+   if (st->pitch_available>0 || optional_synthesis!=NULL)
    {
-      int j;
-      celt_sig_t * restrict outp=st->out_mem+C*(MAX_PERIOD-N)+c;
-      celt_int16_t * restrict pcmp = pcm+c;
-      for (j=0;j<N;j++)
+      if (st->pitch_available>0 && st->pitch_available<MAX_PERIOD)
+        st->pitch_available+=st->frame_size;
+
+      /* Synthesis */
+      denormalise_bands(st->mode, X, freq, bandE);
+      
+      
+      CELT_MOVE(st->out_mem, st->out_mem+C*N, C*(MAX_PERIOD+st->overlap-N));
+      
+      if (mdct_weight_shift)
       {
-         celt_sig_t tmp = ADD32(*outp, MULT16_32_Q15(preemph,st->preemph_memD[c]));
-         st->preemph_memD[c] = tmp;
-         *pcmp = SIG2INT16(tmp);
-         pcmp += C;
-         outp += C;
+         int m;
+         for (c=0;c<C;c++)
+            for (m=mdct_weight_pos+1;m<st->mode->nbShortMdcts;m++)
+               for (i=m+c*N;i<(c+1)*N;i+=st->mode->nbShortMdcts)
+#ifdef FIXED_POINT
+                  freq[i] = SHL32(freq[i], mdct_weight_shift);
+#else
+                  freq[i] = (1<<mdct_weight_shift)*freq[i];
+#endif
+      }
+      compute_inv_mdcts(st->mode, shortBlocks, freq, transient_time, transient_shift, st->out_mem);
+      /* De-emphasis and put everything back at the right place 
+         in the synthesis history */
+      if (optional_synthesis != NULL) {
+         for (c=0;c<C;c++)
+         {
+            int j;
+            for (j=0;j<N;j++)
+            {
+               celt_sig_t tmp = MAC16_32_Q15(st->out_mem[C*(MAX_PERIOD-N)+C*j+c],
+                                   preemph,st->preemph_memD[c]);
+               st->preemph_memD[c] = tmp;
+               optional_synthesis[C*j+c] = SCALEOUT(SIG2WORD16(tmp));
+            }
+         }
       }
    }
+
+   ec_enc_done(&enc);
+   
+   RESTORE_STACK;
+   return nbCompressedBytes;
+}
+
+#ifdef FIXED_POINT
+#ifndef DISABLE_FLOAT_API
+int celt_encode_float(CELTEncoder * restrict st, const float * pcm, float * optional_synthesis, unsigned char *compressed, int nbCompressedBytes)
+{
+   int j, ret, C, N;
+   VARDECL(celt_int16_t, in);
+
+   if (check_encoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
+   if (check_mode(st->mode) != CELT_OK)
+      return CELT_INVALID_MODE;
+
+   SAVE_STACK;
+   C = CHANNELS(st->mode);
+   N = st->block_size;
+   ALLOC(in, C*N, celt_int16_t);
+
+   for (j=0;j<C*N;j++)
+     in[j] = FLOAT2INT16(pcm[j]);
+
+   if (optional_synthesis != NULL) {
+     ret=celt_encode(st,in,in,compressed,nbCompressedBytes);
+      for (j=0;j<C*N;j++)
+         optional_synthesis[j]=in[j]*(1/32768.);
+   } else {
+     ret=celt_encode(st,in,NULL,compressed,nbCompressedBytes);
+   }
+   RESTORE_STACK;
+   return ret;
+
+}
+#endif /*DISABLE_FLOAT_API*/
+#else
+int celt_encode(CELTEncoder * restrict st, const celt_int16_t * pcm, celt_int16_t * optional_synthesis, unsigned char *compressed, int nbCompressedBytes)
+{
+   int j, ret, C, N;
+   VARDECL(celt_sig_t, in);
+
+   if (check_encoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
+   if (check_mode(st->mode) != CELT_OK)
+      return CELT_INVALID_MODE;
+
+   SAVE_STACK;
+   C=CHANNELS(st->mode);
+   N=st->block_size;
+   ALLOC(in, C*N, celt_sig_t);
+   for (j=0;j<C*N;j++) {
+     in[j] = SCALEOUT(pcm[j]);
+   }
+
+   if (optional_synthesis != NULL) {
+      ret = celt_encode_float(st,in,in,compressed,nbCompressedBytes);
+      for (j=0;j<C*N;j++)
+         optional_synthesis[j] = FLOAT2INT16(in[j]);
+   } else {
+      ret = celt_encode_float(st,in,NULL,compressed,nbCompressedBytes);
+   }
+   RESTORE_STACK;
+   return ret;
+}
 #endif
-   if (ec_enc_tell(&st->enc, 0) < nbCompressedBytes*8 - 7)
-      celt_warning_int ("many unused bits: ", nbCompressedBytes*8-ec_enc_tell(&st->enc, 0));
-   /*printf ("%d\n", ec_enc_tell(&st->enc, 0)-8*nbCompressedBytes);*/
-   /* Finishing the stream with a 0101... pattern so that the decoder can check is everything's right */
+
+int celt_encoder_ctl(CELTEncoder * restrict st, int request, ...)
+{
+   va_list ap;
+   
+   if (check_encoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
+   va_start(ap, request);
+   if ((request!=CELT_GET_MODE_REQUEST) && (check_mode(st->mode) != CELT_OK))
+     goto bad_mode;
+   switch (request)
    {
-      int val = 0;
-      while (ec_enc_tell(&st->enc, 0) < nbCompressedBytes*8)
+      case CELT_GET_MODE_REQUEST:
       {
-         ec_enc_uint(&st->enc, val, 2);
-         val = 1-val;
+         const CELTMode ** value = va_arg(ap, const CELTMode**);
+         if (value==0)
+            goto bad_arg;
+         *value=st->mode;
       }
-   }
-   ec_enc_done(&st->enc);
-   {
-      unsigned char *data;
-      int nbBytes = ec_byte_bytes(&st->buf);
-      if (nbBytes > nbCompressedBytes)
+      break;
+      case CELT_SET_COMPLEXITY_REQUEST:
       {
-         celt_warning_int ("got too many bytes:", nbBytes);
-         RESTORE_STACK;
-         return CELT_INTERNAL_ERROR;
+         int value = va_arg(ap, celt_int32_t);
+         if (value<0 || value>10)
+            goto bad_arg;
+         if (value<=2) {
+            st->pitch_enabled = 0; 
+            st->pitch_available = 0;
+         } else {
+              st->pitch_enabled = 1;
+              if (st->pitch_available<1)
+                st->pitch_available = 1;
+         }   
       }
-      /*printf ("%d\n", *nbBytes);*/
-      data = ec_byte_get_buffer(&st->buf);
-      for (i=0;i<nbBytes;i++)
-         compressed[i] = data[i];
-      for (;i<nbCompressedBytes;i++)
-         compressed[i] = 0;
-   }
-   /* Reset the packing for the next encoding */
-   ec_byte_reset(&st->buf);
-   ec_enc_init(&st->enc,&st->buf);
+      break;
+      case CELT_SET_PREDICTION_REQUEST:
+      {
+         int value = va_arg(ap, celt_int32_t);
+         if (value<0 || value>2)
+            goto bad_arg;
+         if (value==0)
+         {
+            st->force_intra   = 1;
+            st->pitch_permitted = 0;
+         } else if (value==1) {
+            st->force_intra   = 0;
+            st->pitch_permitted = 0;
+         } else {
+            st->force_intra   = 0;
+            st->pitch_permitted = 1;
+         }   
+      }
+      break;
+      case CELT_SET_VBR_RATE_REQUEST:
+      {
+         int value = va_arg(ap, celt_int32_t);
+         if (value<0)
+            goto bad_arg;
+         if (value>3072000)
+            value = 3072000;
+         st->VBR_rate = ((st->mode->Fs<<3)+(st->block_size>>1))/st->block_size;
+         st->VBR_rate = ((value<<7)+(st->VBR_rate>>1))/st->VBR_rate;
+      }
+      break;
+      case CELT_RESET_STATE:
+      {
+         const CELTMode *mode = st->mode;
+         int C = mode->nbChannels;
 
-   RESTORE_STACK;
-   return nbCompressedBytes;
-}
+         if (st->pitch_available > 0) st->pitch_available = 1;
 
+         CELT_MEMSET(st->in_mem, 0, st->overlap*C);
+         CELT_MEMSET(st->out_mem, 0, (MAX_PERIOD+st->overlap)*C);
 
-/****************************************************************************/
-/*                                                                          */
-/*                                DECODER                                   */
-/*                                                                          */
-/****************************************************************************/
+         CELT_MEMSET(st->oldBandE, 0, C*mode->nbEBands);
 
+         CELT_MEMSET(st->preemph_memE, 0, C);
+         CELT_MEMSET(st->preemph_memD, 0, C);
+         st->delayedIntra = 1;
+      }
+      break;
+      default:
+         goto bad_request;
+   }
+   va_end(ap);
+   return CELT_OK;
+bad_mode:
+  va_end(ap);
+  return CELT_INVALID_MODE;
+bad_arg:
+   va_end(ap);
+   return CELT_BAD_ARG;
+bad_request:
+   va_end(ap);
+   return CELT_UNIMPLEMENTED;
+}
+
+/**********************************************************************/
+/*                                                                    */
+/*                             DECODER                                */
+/*                                                                    */
+/**********************************************************************/
+#ifdef NEW_PLC
+#define DECODE_BUFFER_SIZE 2048
+#else
+#define DECODE_BUFFER_SIZE MAX_PERIOD
+#endif
+
+#define DECODERVALID   0x4c434454
+#define DECODERPARTIAL 0x5444434c
+#define DECODERFREED   0x4c004400
 
 /** Decoder state 
  @brief Decoder state
  */
 struct CELTDecoder {
+   celt_uint32_t marker;
    const CELTMode *mode;
    int frame_size;
    int block_size;
@@ -631,12 +1100,29 @@ struct CELTDecoder {
    celt_sig_t * restrict preemph_memD;
 
    celt_sig_t *out_mem;
+   celt_sig_t *decode_mem;
 
    celt_word16_t *oldBandE;
    
    int last_pitch_index;
 };
 
+int check_decoder(const CELTDecoder *st) 
+{
+   if (st==NULL)
+   {
+      celt_warning("NULL passed a decoder structure");  
+      return CELT_INVALID_STATE;
+   }
+   if (st->marker == DECODERVALID)
+      return CELT_OK;
+   if (st->marker == DECODERFREED)
+      celt_warning("Referencing a decoder that has already been freed");
+   else
+      celt_warning("This is not a valid CELT decoder structure");
+   return CELT_INVALID_STATE;
+}
+
 CELTDecoder *celt_decoder_create(const CELTMode *mode)
 {
    int N, C;
@@ -648,45 +1134,77 @@ CELTDecoder *celt_decoder_create(const CELTMode *mode)
    N = mode->mdctSize;
    C = CHANNELS(mode);
    st = celt_alloc(sizeof(CELTDecoder));
+
+   if (st==NULL)
+      return NULL;
    
+   st->marker = DECODERPARTIAL;
    st->mode = mode;
    st->frame_size = N;
    st->block_size = N;
    st->overlap = mode->overlap;
 
-   st->out_mem = celt_alloc((MAX_PERIOD+st->overlap)*C*sizeof(celt_sig_t));
+   st->decode_mem = celt_alloc((DECODE_BUFFER_SIZE+st->overlap)*C*sizeof(celt_sig_t));
+   st->out_mem = st->decode_mem+DECODE_BUFFER_SIZE-MAX_PERIOD;
    
    st->oldBandE = (celt_word16_t*)celt_alloc(C*mode->nbEBands*sizeof(celt_word16_t));
-
-   st->preemph_memD = (celt_sig_t*)celt_alloc(C*sizeof(celt_sig_t));;
+   
+   st->preemph_memD = (celt_sig_t*)celt_alloc(C*sizeof(celt_sig_t));
 
    st->last_pitch_index = 0;
-   return st;
+
+   if ((st->decode_mem!=NULL) && (st->out_mem!=NULL) && (st->oldBandE!=NULL) &&
+       (st->preemph_memD!=NULL))
+   {
+      st->marker = DECODERVALID;
+      return st;
+   }
+   /* If the setup fails for some reason deallocate it. */
+   celt_decoder_destroy(st);
+   return NULL;
 }
 
 void celt_decoder_destroy(CELTDecoder *st)
 {
    if (st == NULL)
    {
-      celt_warning("NULL passed to celt_encoder_destroy");
+      celt_warning("NULL passed to celt_decoder_destroy");
       return;
    }
-   if (check_mode(st->mode) != CELT_OK)
-      return;
 
-
-   celt_free(st->out_mem);
+   if (st->marker == DECODERFREED) 
+   {
+      celt_warning("Freeing a decoder which has already been freed"); 
+      return;
+   }
    
-   celt_free(st->oldBandE);
+   if (st->marker != DECODERVALID && st->marker != DECODERPARTIAL)
+   {
+      celt_warning("This is not a valid CELT decoder structure");
+      return;
+   }
    
+   /*Check_mode is non-fatal here because we can still free
+     the encoder memory even if the mode is bad, although calling
+     the free functions in this order is a violation of the API.*/
+   check_mode(st->mode);
+   
+   celt_free(st->decode_mem);
+   celt_free(st->oldBandE);
    celt_free(st->preemph_memD);
-
+   
+   st->marker = DECODERFREED;
+   
    celt_free(st);
 }
 
-/** Handles lost packets by just copying past data with the same offset as the last
+/** Handles lost packets by just copying past data with the same
+    offset as the last
     pitch period */
-static void celt_decode_lost(CELTDecoder * restrict st, short * restrict pcm)
+#ifdef NEW_PLC
+#include "plc.c"
+#else
+static void celt_decode_lost(CELTDecoder * restrict st, celt_word16_t * restrict pcm)
 {
    int c, N;
    int pitch_index;
@@ -696,7 +1214,7 @@ static void celt_decode_lost(CELTDecoder * restrict st, short * restrict pcm)
    int offset;
    SAVE_STACK;
    N = st->block_size;
-   ALLOC(freq,C*N, celt_sig_t);         /**< Interleaved signal MDCTs */
+   ALLOC(freq,C*N, celt_sig_t); /**< Interleaved signal MDCTs */
    
    len = N+st->mode->overlap;
 #if 0
@@ -706,41 +1224,48 @@ static void celt_decode_lost(CELTDecoder * restrict st, short * restrict pcm)
    compute_mdcts(st->mode, st->mode->window, st->out_mem+pitch_index*C, freq);
 
 #else
-   find_spectral_pitch(st->mode, st->mode->fft, &st->mode->psy, st->out_mem+MAX_PERIOD-len, st->out_mem, st->mode->window, len, MAX_PERIOD-len-100, &pitch_index);
+   find_spectral_pitch(st->mode, st->mode->fft, &st->mode->psy, st->out_mem+MAX_PERIOD-len, st->out_mem, st->mode->window, NULL, len, MAX_PERIOD-len-100, &pitch_index);
    pitch_index = MAX_PERIOD-len-pitch_index;
    offset = MAX_PERIOD-pitch_index;
    while (offset+len >= MAX_PERIOD)
       offset -= pitch_index;
    compute_mdcts(st->mode, 0, st->out_mem+offset*C, freq);
-   for (i=0;i<N;i++)
-      freq[i] = MULT16_32_Q15(QCONST16(.9f,15),freq[i]);
+   for (i=0;i<C*N;i++)
+      freq[i] = ADD32(EPSILON, MULT16_32_Q15(QCONST16(.9f,15),freq[i]));
 #endif
    
    
    
    CELT_MOVE(st->out_mem, st->out_mem+C*N, C*(MAX_PERIOD+st->mode->overlap-N));
    /* Compute inverse MDCTs */
-   compute_inv_mdcts(st->mode, 0, freq, -1, 1, st->out_mem);
+   compute_inv_mdcts(st->mode, 0, freq, -1, 0, st->out_mem);
 
    for (c=0;c<C;c++)
    {
       int j;
       for (j=0;j<N;j++)
       {
-         celt_sig_t tmp = ADD32(st->out_mem[C*(MAX_PERIOD-N)+C*j+c],
-                                MULT16_32_Q15(preemph,st->preemph_memD[c]));
+         celt_sig_t tmp = MAC16_32_Q15(st->out_mem[C*(MAX_PERIOD-N)+C*j+c],
+                                preemph,st->preemph_memD[c]);
          st->preemph_memD[c] = tmp;
-         pcm[C*j+c] = SIG2INT16(tmp);
+         pcm[C*j+c] = SCALEOUT(SIG2WORD16(tmp));
       }
    }
    RESTORE_STACK;
 }
+#endif
 
-int celt_decode(CELTDecoder * restrict st, unsigned char *data, int len, celt_int16_t * restrict pcm)
+#ifdef FIXED_POINT
+int celt_decode(CELTDecoder * restrict st, const unsigned char *data, int len, celt_int16_t * restrict pcm)
 {
-   int c, N, N4;
-   int has_pitch;
+#else
+int celt_decode_float(CELTDecoder * restrict st, const unsigned char *data, int len, celt_sig_t * restrict pcm)
+{
+#endif
+   int i, c, N, N4;
+   int has_pitch, has_fold;
    int pitch_index;
+   int bits;
    ec_dec dec;
    ec_byte_buffer buf;
    VARDECL(celt_sig_t, freq);
@@ -748,13 +1273,23 @@ int celt_decode(CELTDecoder * restrict st, unsigned char *data, int len, celt_in
    VARDECL(celt_norm_t, P);
    VARDECL(celt_ener_t, bandE);
    VARDECL(celt_pgain_t, gains);
-   VARDECL(int, stereo_mode);
+   VARDECL(int, fine_quant);
+   VARDECL(int, pulses);
+   VARDECL(int, offsets);
+   VARDECL(int, fine_priority);
+
    int shortBlocks;
+   int intra_ener;
    int transient_time;
    int transient_shift;
+   int mdct_weight_shift=0;
    const int C = CHANNELS(st->mode);
+   int mdct_weight_pos=0;
    SAVE_STACK;
 
+   if (check_decoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
    if (check_mode(st->mode) != CELT_OK)
       return CELT_INVALID_MODE;
 
@@ -762,110 +1297,128 @@ int celt_decode(CELTDecoder * restrict st, unsigned char *data, int len, celt_in
    N4 = (N-st->overlap)>>1;
 
    ALLOC(freq, C*N, celt_sig_t); /**< Interleaved signal MDCTs */
-   ALLOC(X, C*N, celt_norm_t);         /**< Interleaved normalised MDCTs */
-   ALLOC(P, C*N, celt_norm_t);         /**< Interleaved normalised pitch MDCTs*/
+   ALLOC(X, C*N, celt_norm_t);   /**< Interleaved normalised MDCTs */
+   ALLOC(P, 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);
    
-   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;
    }
+   if (len<0) {
+     RESTORE_STACK;
+     return CELT_BAD_ARG;
+   }
    
-   ec_byte_readinit(&buf,data,len);
+   ec_byte_readinit(&buf,(unsigned char*)data,len);
    ec_dec_init(&dec,&buf);
    
-   shortBlocks = ec_dec_bits(&dec, 1);
+   decode_flags(&dec, &intra_ener, &has_pitch, &shortBlocks, &has_fold);
    if (shortBlocks)
    {
       transient_shift = ec_dec_bits(&dec, 2);
-      if (transient_shift)
+      if (transient_shift == 3)
+      {
          transient_time = ec_dec_uint(&dec, N+st->mode->overlap);
-      else
+      } else {
+         mdct_weight_shift = transient_shift;
+         if (mdct_weight_shift && st->mode->nbShortMdcts>2)
+            mdct_weight_pos = ec_dec_uint(&dec, st->mode->nbShortMdcts-1);
+         transient_shift = 0;
          transient_time = 0;
+      }
    } else {
       transient_time = -1;
       transient_shift = 0;
    }
-   /* Get the pitch gains */
-   has_pitch = unquant_pitch(gains, st->mode->nbPBands, &dec);
    
-   /* Get the pitch index */
    if (has_pitch)
    {
       pitch_index = ec_dec_uint(&dec, MAX_PERIOD-(2*N-2*N4));
       st->last_pitch_index = pitch_index;
    } else {
-      /* FIXME: We could be more intelligent here and just not compute the MDCT */
       pitch_index = 0;
+      for (i=0;i<st->mode->nbPBands;i++)
+         gains[i] = 0;
    }
 
+   ALLOC(fine_quant, st->mode->nbEBands, int);
    /* Get band energies */
-   unquant_energy(st->mode, bandE, st->oldBandE, 20*C+len*8/5, st->mode->prob, &dec);
+   unquant_coarse_energy(st->mode, bandE, st->oldBandE, len*8/3, intra_ener, st->mode->prob, &dec);
+   
+   ALLOC(pulses, st->mode->nbEBands, int);
+   ALLOC(offsets, st->mode->nbEBands, int);
+   ALLOC(fine_priority, st->mode->nbEBands, int);
+
+   for (i=0;i<st->mode->nbEBands;i++)
+      offsets[i] = 0;
 
-   /* Pitch MDCT */
-   compute_mdcts(st->mode, 0, st->out_mem+pitch_index*C, freq);
+   bits = len*8 - ec_dec_tell(&dec, 0) - 1;
+   if (has_pitch)
+      bits -= st->mode->nbPBands;
+   compute_allocation(st->mode, offsets, bits, pulses, fine_quant, fine_priority);
+   /*bits = ec_dec_tell(&dec, 0);
+   compute_fine_allocation(st->mode, fine_quant, (20*C+len*8/5-(ec_dec_tell(&dec, 0)-bits))/C);*/
+   
+   unquant_fine_energy(st->mode, bandE, st->oldBandE, fine_quant, &dec);
 
+
+   if (has_pitch) 
    {
       VARDECL(celt_ener_t, bandEp);
+      
+      /* Pitch MDCT */
+      compute_mdcts(st->mode, 0, st->out_mem+pitch_index*C, freq);
       ALLOC(bandEp, st->mode->nbEBands*C, celt_ener_t);
       compute_band_energies(st->mode, freq, bandEp);
       normalise_bands(st->mode, freq, P, bandEp);
+      /* Apply pitch gains */
+   } else {
+      for (i=0;i<C*N;i++)
+         P[i] = 0;
    }
 
-   ALLOC(stereo_mode, st->mode->nbEBands, int);
-   stereo_decision(st->mode, X, stereo_mode, st->mode->nbEBands);
-   /* Apply pitch gains */
-   pitch_quant_bands(st->mode, P, gains);
-
    /* Decode fixed codebook and merge with pitch */
-   unquant_bands(st->mode, X, P, bandE, stereo_mode, len*8, shortBlocks, &dec);
-
-   if (C==2)
-   {
-      renormalise_bands(st->mode, X);
-   }
+   if (C==1)
+      unquant_bands(st->mode, X, P, has_pitch, gains, bandE, pulses, shortBlocks, has_fold, len*8, &dec);
+#ifndef DISABLE_STEREO
+   else
+      unquant_bands_stereo(st->mode, X, P, has_pitch, gains, bandE, pulses, shortBlocks, has_fold, len*8, &dec);
+#endif
+   unquant_energy_finalise(st->mode, bandE, st->oldBandE, fine_quant, fine_priority, len*8-ec_dec_tell(&dec, 0), &dec);
+   
    /* Synthesis */
    denormalise_bands(st->mode, X, freq, bandE);
 
 
-   CELT_MOVE(st->out_mem, st->out_mem+C*N, C*(MAX_PERIOD+st->overlap-N));
+   CELT_MOVE(st->decode_mem, st->decode_mem+C*N, C*(DECODE_BUFFER_SIZE+st->overlap-N));
+   if (mdct_weight_shift)
+   {
+      int m;
+      for (c=0;c<C;c++)
+         for (m=mdct_weight_pos+1;m<st->mode->nbShortMdcts;m++)
+            for (i=m+c*N;i<(c+1)*N;i+=st->mode->nbShortMdcts)
+#ifdef FIXED_POINT
+               freq[i] = SHL32(freq[i], mdct_weight_shift);
+#else
+               freq[i] = (1<<mdct_weight_shift)*freq[i];
+#endif
+   }
    /* Compute inverse MDCTs */
    compute_inv_mdcts(st->mode, shortBlocks, freq, transient_time, transient_shift, st->out_mem);
 
    for (c=0;c<C;c++)
    {
       int j;
-      const celt_sig_t * restrict outp=st->out_mem+C*(MAX_PERIOD-N)+c;
-      celt_int16_t * restrict pcmp = pcm+c;
       for (j=0;j<N;j++)
       {
-         celt_sig_t tmp = ADD32(*outp, MULT16_32_Q15(preemph,st->preemph_memD[c]));
+         celt_sig_t tmp = MAC16_32_Q15(st->out_mem[C*(MAX_PERIOD-N)+C*j+c],
+                                preemph,st->preemph_memD[c]);
          st->preemph_memD[c] = tmp;
-         *pcmp = SIG2INT16(tmp);
-         pcmp += C;
-         outp += C;
-      }
-   }
-
-   {
-      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;
+         pcm[C*j+c] = SCALEOUT(SIG2WORD16(tmp));
       }
    }
 
@@ -874,3 +1427,104 @@ int celt_decode(CELTDecoder * restrict st, unsigned char *data, int len, celt_in
    /*printf ("\n");*/
 }
 
+#ifdef FIXED_POINT
+#ifndef DISABLE_FLOAT_API
+int celt_decode_float(CELTDecoder * restrict st, const unsigned char *data, int len, float * restrict pcm)
+{
+   int j, ret, C, N;
+   VARDECL(celt_int16_t, out);
+
+   if (check_decoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
+   if (check_mode(st->mode) != CELT_OK)
+      return CELT_INVALID_MODE;
+
+   SAVE_STACK;
+   C = CHANNELS(st->mode);
+   N = st->block_size;
+   ALLOC(out, C*N, celt_int16_t);
+
+   ret=celt_decode(st, data, len, out);
+
+   for (j=0;j<C*N;j++)
+     pcm[j]=out[j]*(1/32768.);
+   RESTORE_STACK;
+   return ret;
+}
+#endif /*DISABLE_FLOAT_API*/
+#else
+int celt_decode(CELTDecoder * restrict st, const unsigned char *data, int len, celt_int16_t * restrict pcm)
+{
+   int j, ret, C, N;
+   VARDECL(celt_sig_t, out);
+
+   if (check_decoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
+   if (check_mode(st->mode) != CELT_OK)
+      return CELT_INVALID_MODE;
+
+   SAVE_STACK;
+   C = CHANNELS(st->mode);
+   N = st->block_size;
+   ALLOC(out, C*N, celt_sig_t);
+
+   ret=celt_decode_float(st, data, len, out);
+
+   for (j=0;j<C*N;j++)
+     pcm[j] = FLOAT2INT16 (out[j]);
+
+   RESTORE_STACK;
+   return ret;
+}
+#endif
+
+int celt_decoder_ctl(CELTDecoder * restrict st, int request, ...)
+{
+   va_list ap;
+
+   if (check_decoder(st) != CELT_OK)
+      return CELT_INVALID_STATE;
+
+   va_start(ap, request);
+   if ((request!=CELT_GET_MODE_REQUEST) && (check_mode(st->mode) != CELT_OK))
+     goto bad_mode;
+   switch (request)
+   {
+      case CELT_GET_MODE_REQUEST:
+      {
+         const CELTMode ** value = va_arg(ap, const CELTMode**);
+         if (value==0)
+            goto bad_arg;
+         *value=st->mode;
+      }
+      break;
+      case CELT_RESET_STATE:
+      {
+         const CELTMode *mode = st->mode;
+         int C = mode->nbChannels;
+
+         CELT_MEMSET(st->decode_mem, 0, (DECODE_BUFFER_SIZE+st->overlap)*C);
+         CELT_MEMSET(st->oldBandE, 0, C*mode->nbEBands);
+
+         CELT_MEMSET(st->preemph_memD, 0, C);
+
+         st->last_pitch_index = 0;
+      }
+      break;
+      default:
+         goto bad_request;
+   }
+   va_end(ap);
+   return CELT_OK;
+bad_mode:
+  va_end(ap);
+  return CELT_INVALID_MODE;
+bad_arg:
+   va_end(ap);
+   return CELT_BAD_ARG;
+bad_request:
+      va_end(ap);
+  return CELT_UNIMPLEMENTED;
+}